aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* changed namespace of the http upload featureDaniel Gultsch2015-06-301-1/+1
* made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-309-69/+74
* made storage path decision entirely based upon file extensionDaniel Gultsch2015-06-301-2/+4
* refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-305-37/+39
* always show copy original url in context menu when url is availableDaniel Gultsch2015-06-301-2/+1
* untested pgp support for http uploadDaniel Gultsch2015-06-292-6/+31
* added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-292-0/+15
* make quick actions available in conferences when file attachment is availableDaniel Gultsch2015-06-291-23/+28
* show attach button in conferences when http upload is availableDaniel Gultsch2015-06-294-7/+14
* initial http upload supportDaniel Gultsch2015-06-2914-95/+278
* version bump to 1.4.51.4.5Daniel Gultsch2015-06-291-2/+2
* don't parse body from muc status messagesDaniel Gultsch2015-06-281-6/+7
* fixed parsing of muc status messages in new message parserDaniel Gultsch2015-06-281-6/+18
* pulled new translations from transifexDaniel Gultsch2015-06-232-3/+20
* Merge branch 'development'1.4.4Daniel Gultsch2015-06-2368-803/+985
|\
| * don't perform dns lookups on domain parts that obviously look like ip addressesDaniel Gultsch2015-06-192-53/+67
| * changed paragraph dividerDaniel Gultsch2015-06-101-1/+1
| * pulled new translations from transifexDaniel Gultsch2015-06-102-0/+10
| * made i/o and memory intensive operations execute in serial orderDaniel Gultsch2015-06-052-11/+52
| * version bumpDaniel Gultsch2015-06-041-2/+2
| * fixed obvious bug in dns helperDaniel Gultsch2015-06-041-2/+2
| * streamlined dns helper by ignoring weightDaniel Gultsch2015-06-041-55/+10
| * send_received muc messages will mark a conversation a readDaniel Gultsch2015-06-041-1/+1
| * reworked handeling of system contactsDaniel Gultsch2015-06-034-32/+51
| * properly calculate remaining size. should fix #1243Daniel Gultsch2015-06-031-2/+7
| * really update build toolsDaniel Gultsch2015-06-023-3/+3
| * upgrade build toolsDaniel Gultsch2015-06-021-2/+0
| * avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch2015-06-022-1/+7
| * stick with 1.4.xDaniel Gultsch2015-06-021-1/+1
| * fixed more edge cases in muc message parserDaniel Gultsch2015-06-021-3/+3
| * improved compatibility with muc components that change the message idDaniel Gultsch2015-06-021-2/+3
| * let dns library take care of no-srv style hosts as wellDaniel Gultsch2015-05-282-12/+16
| * use dns library to resolve missing ipv6 or ipv4 addressesDaniel Gultsch2015-05-281-1/+30
| * parse nick and avatar only from available presences to avoid potential error ...Daniel Gultsch2015-05-271-47/+26
| * removed unnecessary / inacurate debug loggingDaniel Gultsch2015-05-261-2/+1
| * deduplicate private muc messagesDaniel Gultsch2015-05-261-1/+3
| * update unread count badge only when necessaryDaniel Gultsch2015-05-261-7/+11
| * added default iq handler to print some iq error messagesDaniel Gultsch2015-05-261-4/+16
| * pulled translations from transifexDaniel Gultsch2015-05-264-0/+20
| * added choose picture as another quick action. fixes #1221Daniel Gultsch2015-05-2628-1/+249
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-264-16/+16
| * Merge branch 'master' into developmentDaniel Gultsch2015-05-253-6/+13
| |\
| * \ Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-05-211-2/+8
| |\ \
| | * \ Merge pull request #1212 from emdete/add_jid_to_show_locationDaniel Gultsch2015-05-201-3/+8
| | |\ \
| | | * | fix to detect the sender jid correctlyM. Dietrich2015-05-201-3/+8
| | * | | Merge pull request #1211 from emdete/add_jid_to_show_locationDaniel Gultsch2015-05-201-0/+1
| | |\| |
| | | * | add extra jid to intend "show location"M. Dietrich2015-05-201-0/+1
| * | | | Merge branch 'master' into developmentDaniel Gultsch2015-05-212-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-203-8/+22
| * | | | pulled translations from transifexDaniel Gultsch2015-05-207-0/+35