Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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 | 2 | -0/+33 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 2 | -0/+33 | |
| | |\ \ \ | | | | | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | |||||
| | | * | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | fiaxh | 2016-02-24 | 2 | -0/+33 | |
| | | | | | | ||||||
| * | | | | | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 7 | -7/+28 | |
| |/ / / / | ||||||
* | | | | | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 2 | -1/+9 | |
| | | | | | ||||||
* | | | | | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 2 | -13/+1 | |
| | | | | | ||||||
* | | | | | Merge tag '1.10.1' into trz/merge_1.10.1 | steckbrief | 2016-02-28 | 8 | -34/+80 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | hide add account icons when single_account is set to true | Daniel Gultsch | 2016-02-24 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | optionally lock conference domains as well and hide known domains in ui | Daniel Gultsch | 2016-02-24 | 5 | -17/+39 | |
| | | | | | ||||||
| * | | | | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 2 | -5/+7 | |
| | |/ / | |/| | | ||||||
| * | | | Merge pull request #1715 from fiaxh/gpg_decryption_failed | Daniel Gultsch | 2016-02-24 | 1 | -0/+13 | |
| |\ \ \ | | | | | | | | | | | PGP Retry decryption from message menu | |||||
| | * | | | Retry decryption from message menu | fiaxh | 2016-02-23 | 1 | -0/+13 | |
| | |/ / | ||||||
| * / / | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 1 | -1/+0 | |
| |/ / | ||||||
| * | | 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 | 1 | -11/+16 | |
| | | | ||||||
* | | | Fixes FS#48 and FS#136 | lookshe | 2016-02-28 | 2 | -14/+1 | |
| | | | | | | | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage | |||||
* | | | Unused imports / methods removed | steckbrief | 2016-02-24 | 1 | -19/+0 | |
| | | | ||||||
* | | | Readded MessageDetailsDialog to message context menu after merge | steckbrief | 2016-02-24 | 1 | -0/+4 | |
| | | | ||||||
* | | | Removed stupid message correction | steckbrief | 2016-02-23 | 4 | -69/+10 | |
| | | | ||||||
* | | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 2 | -45/+7 | |
| | | | | | | | | | | | | already done with a more convenient method | |||||
* | | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 1 | -5/+5 | |
| | | | ||||||
* | | | 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 | |
| | | | ||||||
* | | | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 6 | -32/+112 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.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/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml | |||||
| * | | show load more messages when auto loading is disabled and messages are still ↵ | Daniel Gultsch | 2016-02-21 | 1 | -6/+10 | |
| | | | | | | | | | | | | left on server | |||||
| * | | skip avatar ui when pep is not available. fixes #1706 | Daniel Gultsch | 2016-02-19 | 1 | -5/+5 | |
| | | | ||||||
| * | | don't reset whisper on reInit. fixes #1637 | Daniel Gultsch | 2016-02-19 | 1 | -3/+0 | |
| | | | ||||||
| * | | only offer message correction for the very last message | Daniel Gultsch | 2016-02-17 | 1 | -3/+6 | |
| | | | ||||||
| * | | made clear that archiving preferences are server side | Daniel Gultsch | 2016-02-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | options to settings | |||||
| * | | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 3 | -15/+74 | |
| | | | ||||||
| * | | removed unnecessary conditions when sending read marker | Daniel Gultsch | 2016-02-15 | 1 | -5/+1 | |
| | | | ||||||
| * | | only show load more messages button when mam is available | Daniel Gultsch | 2016-02-14 | 2 | -1/+6 | |
| | | | | | | | | | | | | also update ui after that button has been pressed. fixes #1695 | |||||
| * | | fixed server info push not showing up when unavailable | Daniel Gultsch | 2016-02-14 | 1 | -2/+2 | |
| | | | ||||||
| * | | fixed compile bug in free version | Daniel Gultsch | 2016-02-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 1 | -0/+13 | |
| | | | ||||||
* | | | Merge tag '1.9.4' into trz/merge_1.9.4 | lookshe | 2016-02-16 | 5 | -41/+155 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml | |||||
| * | | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 1 | -1/+63 | |
| | | | ||||||
| * | | fixed performance regression in on scroll listener | Daniel Gultsch | 2016-02-04 | 1 | -1/+6 | |
| | | | ||||||
| * | | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 3 | -9/+49 | |
| | | | ||||||
| * | | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 2 | -35/+39 | |
| |\ \ | | | | | | | | | | | | | into singpolyma-disco-caps | |||||
| | * | | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 2 | -35/+39 | |
| | | | | | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | |||||
| * | | | fixed 'unencrypted' not showing up for conferences when encryption is forced | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Implements FS#64: Show who wrote last message in conversation overview | steckbrief | 2016-02-13 | 1 | -2/+13 | |
| | | | | ||||||
* | | | | Fixed settings synchronization | steckbrief | 2016-02-12 | 1 | -60/+66 | |
| | | | | ||||||
* | | | | Imports organized | steckbrief | 2016-02-12 | 20 | -110/+28 | |
| | | | | ||||||
* | | | | green bubbles and setting to choose green or white bubbles removed | steckbrief | 2016-02-12 | 3 | -20/+1 | |
| | | | | ||||||
* | | | | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 8 | -140/+58 | |
| | | | |