aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* 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
* 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
* 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
* 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-2623-1/+25
* renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-264-16/+16
* Merge branch 'master' into developmentDaniel Gultsch2015-05-252-5/+12
|\
| * use same sm check inside xmppconnection and outDaniel Gultsch2015-05-251-1/+1
| * log connection age and reshedule ping checkDaniel Gultsch2015-05-251-4/+11
* | 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-211-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | fixed with attaching wrong files when returning to activity and background se...Daniel Gultsch2015-05-211-1/+1
* | | added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-202-6/+19
* | | pulled translations from transifexDaniel Gultsch2015-05-207-0/+35
* | | Merge branch 'master' into developmentDaniel Gultsch2015-05-201-4/+3
|\| |
| * | don't allow user to accidentally send empty messages1.4.1Daniel Gultsch2015-05-201-4/+3
* | | proper error parsing. some clean upDaniel Gultsch2015-05-201-41/+49
* | | fixed npe in new message parserDaniel Gultsch2015-05-201-1/+3
* | | fixed muc mam. added a few security checksDaniel Gultsch2015-05-202-25/+35
* | | fixed read/unread markersDaniel Gultsch2015-05-201-10/+9
* | | added mam stuff to new message parserDaniel Gultsch2015-05-203-9/+28