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
| |/ / / / / /
* | | | | | / use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-074-5/+6
* | | | | | corrected getRealPathFromUrilookshe2016-03-072-4/+43
* | | | | | Finally fixes FS#142lookshe2016-03-071-4/+0
| |_|_|_|/ |/| | | |
* | | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-062-7/+5
* | | | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-0215-978/+1315
* | | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0210-70/+11
* | | | | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* | | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-2820-94/+221
|\| | | |
| * | | | 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
| | |/ /
| * | | 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
* | | Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-285-24/+3
* | | Unused imports / methods removedsteckbrief2016-02-243-27/+0
* | | Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-242-11/+1
* | | Readded MessageDetailsDialog to message context menu after mergesteckbrief2016-02-241-0/+4
* | | Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
* | | Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-232-18/+17
* | | Removed stupid message correctionsteckbrief2016-02-236-110/+10
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-235-68/+8
* | | Changed access to presences according to new Presence representation in Csteckbrief2016-02-233-14/+15
* | | Removed non-existing member variablesteckbrief2016-02-231-1/+1
* | | Fix visibility of updateStatusMessages method that LoadMoreMessages can worksteckbrief2016-02-231-1/+1
* | | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
* | | Removed unnecessary dependencies to XmppConnectionService and added allowMess...steckbrief2016-02-235-43/+11
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2222-144/+509
|\| |
| * | 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
| * | change uuid when replacing messagesDaniel Gultsch2016-02-202-1/+9
| * | decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9