aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-02-232-3/+9
|\
| * set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+2
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-222-2/+3
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-0/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-16/+40
|\|
| * change uuid when replacing messagesDaniel Gultsch2016-02-201-0/+5
| * don't log start reasonDaniel Gultsch2016-02-171-1/+0
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-6/+7
| * fixed regression that caused ui to redraw a lotDaniel Gultsch2016-02-161-4/+8
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-0/+4
| * added some OTR loggingDaniel Gultsch2016-02-161-1/+7
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-4/+9
* | Merge branch 'siacs/master' into developmentChristian S2016-02-141-14/+77
|\|
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-9/+23
| * fixed compile bug in free versionDaniel Gultsch2016-02-131-2/+2
| * push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-4/+27
| * send muc messages after joinDaniel Gultsch2016-02-101-1/+2
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-0/+27
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-042-29/+101
|\|
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-041-2/+2
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-8/+13
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-042-7/+12
| * count all messages in a queryDaniel Gultsch2016-02-031-4/+1
| * Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-031-2/+12
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-031-1/+58
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-4/+5
| |\
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-241-4/+5
| * | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-021-12/+2
| * | avoid npe when accessing the pgp connection serviceDaniel Gultsch2016-02-021-1/+1
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-3/+10
* | | Merge branch 'siacs/master'Christian S2016-01-311-2/+6
|\| |
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-2/+6
| |/
* | hide 'disable foreground service' in foreground notificationChristian S2016-01-201-3/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-01-171-9/+9
|\|
| * reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-9/+9
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-1/+1
|\|
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-1/+1
* | Merge pull request #63 from siacs/masterChristian S2016-01-131-5/+10
|\|
| * show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
* | Merge branch 'siacs/master' into developmentChristian S2016-01-102-10/+12
|\|
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-2/+8
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-7/+1
| * added missing synchronize when pushing messages from mam backlogDaniel Gultsch2016-01-041-1/+3
* | copy commitsChristian S2016-01-041-2/+1
|\|
| * properly rotate avatarsDaniel Gultsch2016-01-041-2/+1
* | copy commitsChristian S2015-12-281-3/+7
|\|
| * dedublicate bookmarksDaniel Gultsch2015-12-271-3/+7
* | copy commitsChristian S2015-12-163-6/+17
|\|
| * timeout service discovery after 20sDaniel Gultsch2015-12-151-3/+9