aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-2910-147/+286
| * | rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| * | made hashtable in roster store jids instead of stringsDaniel Gultsch2016-02-281-9/+7
| * | always search offline contacts as well. fixes #1653Daniel Gultsch2016-02-271-0/+1
| * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-02-273-1/+34
| |\ \
| | * \ Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-273-1/+34
| | |\ \
| | | * | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= Mfiaxh2016-02-242-0/+33
| | | * | No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
| * | | | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-278-8/+29
| |/ / /
* | | | bug fixesChristian S2016-02-271-2/+1
* | | | Merge branch 'siacs/master' into developmentChristian S2016-02-2717-55/+163
|\ \ \ \
| * | | | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-271-1/+1
| |/ / /
| * | | 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
| * | | hide add account icons when single_account is set to trueDaniel Gultsch2016-02-242-1/+5
| * | | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-249-22/+74
| * | | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-246-26/+66
| | |/ | |/|
| * | Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-243-1/+17
| |\ \
| | * | Retry decryption from message menufiaxh2016-02-233-1/+17
| | |/
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-239-60/+89
|\| |
| * | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-232-2/+2
| * | update notification after message correctionDaniel Gultsch2016-02-231-0/+1
| * | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| |/
| * properly trigger show load more messages in mucsDaniel Gultsch2016-02-221-2/+10
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-225-37/+51
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-212-6/+14
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-02-2017-95/+321
|\|
| * change uuid when replacing messagesDaniel Gultsch2016-02-202-1/+9
| * decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| * never parse show in presences as offlineDaniel Gultsch2016-02-192-12/+16
| * don't log start reasonDaniel Gultsch2016-02-171-1/+0
| * only offer message correction for the very last messageDaniel Gultsch2016-02-174-8/+37
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-172-7/+8
| * log reason why otr message won't be parsedDaniel Gultsch2016-02-161-1/+2
| * fixed regression that caused ui to redraw a lotDaniel Gultsch2016-02-161-4/+8
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-1/+1
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-164-3/+13
| * added some OTR loggingDaniel Gultsch2016-02-162-5/+14
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1510-39/+200
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| * add missing type='submit' attribute to enable push formDaniel Gultsch2016-02-151-0/+1
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-142-1/+6
| * fixed server info push not showing up when unavailableDaniel Gultsch2016-02-141-2/+2
* | try to automatically rejoin muc after beeing kickedChristian S2016-02-141-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-02-148-54/+240
|\|