| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 6 | -52/+137 | |
| | | | | | | | | | | | | | | | | | already trusted | |||||
| | | * | | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 2 | -6/+6 | |
| | | | | | ||||||
| | | * | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 12 | -173/+320 | |
| | | | | | ||||||
| | | * | | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | made hashtable in roster store jids instead of strings | Daniel Gultsch | 2016-02-28 | 1 | -9/+7 | |
| | | | | | ||||||
| | | * | | always search offline contacts as well. fixes #1653 | Daniel Gultsch | 2016-02-27 | 1 | -0/+1 | |
| | | | | | ||||||
| | | * | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-02-27 | 3 | -1/+34 | |
| | | |\ \ | ||||||
| | | | * \ | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 3 | -1/+34 | |
| | | | |\ \ | | | | | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | |||||
| | | | | * | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | fiaxh | 2016-02-24 | 2 | -0/+33 | |
| | | | | | | | ||||||
| | | | | * | | No possibility of multiple invocation of log export | fiaxh | 2016-02-24 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 8 | -8/+29 | |
| | | |/ / / | ||||||
| * | | | | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 1 | -1/+2 | |
| |\| | | | | ||||||
| | * | | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19 | lookshe | 2016-03-08 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-07 | 9 | -22/+49 | |
| |\| | | | | ||||||
| | * | | | | Fixes FS#151 - Missing button on image-links | lookshe | 2016-03-07 | 4 | -5/+6 | |
| | | | | | | ||||||
| | * | | | | corrected getRealPathFromUri | lookshe | 2016-03-07 | 2 | -4/+43 | |
| | | | | | | ||||||
| | * | | | | Finally fixes FS#142 | lookshe | 2016-03-07 | 3 | -13/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 302 | -5778/+20658 | |
| |\| | | | | ||||||
| | * | | | | Implements: FS#142 - Fix Conference notifications | lookshe | 2016-03-06 | 2 | -7/+5 | |
| | | | | | | ||||||
| | * | | | | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 20 | -981/+1331 | |
| | | | | | | ||||||
| | * | | | | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 34 | -142/+13 | |
| | | | | | | ||||||
| | * | | | | Fixes FS#148: Remove 'store' hint from chat-markers | steckbrief | 2016-03-02 | 1 | -2/+1 | |
| | | | | | | ||||||
| | * | | | | externalized string 'Retry decryption' | steckbrief | 2016-02-28 | 3 | -1/+3 | |
| | | | | | | ||||||
| | * | | | | Merge tag '1.10.1' into trz/merge_1.10.1 | steckbrief | 2016-02-28 | 23 | -98/+230 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml | |||||
| | | * | | | disallow message correction by default. fixes #1720 | Daniel Gultsch | 2016-02-26 | 2 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | execute pending mam queries every time we come online | Daniel Gultsch | 2016-02-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | hide add account icons when single_account is set to true | Daniel Gultsch | 2016-02-24 | 2 | -1/+5 | |
| | | | | | | ||||||
| | | * | | | optionally lock conference domains as well and hide known domains in ui | Daniel Gultsch | 2016-02-24 | 10 | -22/+76 | |
| | | | | | | ||||||
| | | * | | | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 6 | -26/+66 | |
| | | | |/ | | |/| | ||||||
| | | * | | Merge pull request #1715 from fiaxh/gpg_decryption_failed | Daniel Gultsch | 2016-02-24 | 5 | -2/+21 | |
| | | |\ \ | | | | | | | | | | | PGP Retry decryption from message menu | |||||
| | | | * | | Retry decryption from message menu | fiaxh | 2016-02-23 | 5 | -2/+21 | |
| | | | |/ | ||||||
| | | * | | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 2 | -2/+2 | |
| | | | | | ||||||
| | | * | | update notification after message correction | Daniel Gultsch | 2016-02-23 | 1 | -0/+1 | |
| | | | | | ||||||
| | | * | | reset pending subscription request when receiving roster update | Daniel Gultsch | 2016-02-23 | 1 | -0/+2 | |
| | | | | | ||||||
| | | * | | made presences object final in contact | Daniel Gultsch | 2016-02-23 | 1 | -5/+1 | |
| | | |/ | ||||||
| | | * | properly trigger show load more messages in mucs | Daniel Gultsch | 2016-02-22 | 1 | -2/+10 | |
| | | | | ||||||
| | | * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 6 | -39/+54 | |
| | | | | ||||||
| | * | | Fixes FS#48 and FS#136 | lookshe | 2016-02-28 | 5 | -24/+3 | |
| | | | | | | | | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage | |||||
| | * | | Unused imports / methods removed | steckbrief | 2016-02-24 | 3 | -27/+0 | |
| | | | | ||||||
| | * | | Fixes FS#89 after merge conflict | steckbrief | 2016-02-24 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵ | steckbrief | 2016-02-24 | 2 | -11/+1 | |
| | | | | | | | | | | | | | for auto downloading image links moved to global Utility Class) | |||||
| | * | | Readded MessageDetailsDialog to message context menu after merge | steckbrief | 2016-02-24 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | Reviewed commit for FS#34 after merge | steckbrief | 2016-02-24 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 2 | -18/+17 | |
| | | | | | | | | | | | | | XmppConnectionService marked as deprecated | |||||
| | * | | Removed stupid message correction | steckbrief | 2016-02-23 | 34 | -167/+10 | |
| | | | | ||||||
| | * | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 21 | -92/+8 | |
| | | | | | | | | | | | | | already done with a more convenient method | |||||
| | * | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 3 | -14/+15 | |
| | | | | ||||||
| | * | | Removed non-existing member variable | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix visibility of updateStatusMessages method that LoadMoreMessages can work | steckbrief | 2016-02-23 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) | steckbrief | 2016-02-23 | 1 | -0/+15 | |
| | | | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |