aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+2
|\
* \ FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-1/+2
|\ \
| * | Typo `attempt`licaon-kter2016-03-221-1/+1
| * | be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-0/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-221-1/+5
|\ \ \ | | |/ | |/|
* | | fixed merge errorslookshe2016-03-201-1/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-151-3/+3
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-3/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-25/+15
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-35/+44
|\| |
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-082-20/+64
|\ \ \ | | |/ | |/|
| * | moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| * | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| * | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-1/+9
| * | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-5/+5
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-2/+38
| * | Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-271-1/+1
| |\ \
| | * | No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
* | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-061-3/+1
* | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-4/+0
* | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-282-16/+23
|\| | |
| * | | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| * | | execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
| * | | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-12/+17
| * | | 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
* | | Unused imports / methods removedsteckbrief2016-02-242-8/+0
* | | Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-241-10/+0
* | | Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-231-18/+9
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-3/+1
* | | Removed unnecessary dependencies to XmppConnectionService and added allowMess...steckbrief2016-02-231-16/+4
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-222-26/+94
|\| |
| * | show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-0/+4
| * | 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
| * | 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
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-162-57/+151
|\| |
| * | send muc messages after joinDaniel Gultsch2016-02-101-1/+2
| * | allow user to set MAM preferencesDaniel Gultsch2016-02-091-0/+27
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 12:51:42 +0000