| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fixed merge errors | lookshe | 2016-03-20 | 2 | -19/+25 |
| | | |||||
| * | Merge tag '1.11.1' into trz/merge_1.11.1 | lookshe | 2016-03-17 | 4 | -59/+100 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml | ||||
| | * | made it possible to share text files | Daniel Gultsch | 2016-03-16 | 1 | -7/+8 |
| | | | |||||
| | * | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 2 | -30/+66 |
| | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| | * | added logging in case fragment wasn't attached | Daniel Gultsch | 2016-03-13 | 1 | -0/+5 |
| | | | |||||
| | * | fixed recursive call instead of call to super in PublishProfileActivity | Daniel Gultsch | 2016-03-13 | 1 | -5/+1 |
| | | | |||||
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-15 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -1/+1 |
| |\| | | |||||
| * | | | Added method to get body from message if hasMeCommand and harmonized ↵ | lookshe | 2016-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | extraction of fileextension (FS#38) | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 3 | -77/+11 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 3 | -16/+7 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 1 | -2/+1 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-08 | 1 | -17/+20 |
| |\| | | |||||
| * | | | Fixes FS#153 - Check if url, phone and email are linkified correctly | lookshe | 2016-03-08 | 1 | -6/+31 |
| | | | | |||||
| * | | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare | steckbrief | 2016-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 13 | -200/+365 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml | ||||
| | * | | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 3 | -4/+17 |
| | | | | |||||
| | * | | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 1 | -1/+14 |
| | | | | |||||
| | * | | Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵ | Daniel Gultsch | 2016-03-04 | 1 | -0/+10 |
| | |\ \ | | | | | | | | | | | | | tarun018-Mess | ||||
| | | * | | Fix Issue #1634 : Shows XMPP URI as links. | Tarun | 2016-02-29 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. | ||||
| | * | | | show host in file size checker | Daniel Gultsch | 2016-03-04 | 1 | -1/+14 |
| | | | | | |||||
| | * | | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 1 | -22/+40 |
| | | | | | |||||
| | * | | | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | | | | |||||
| | * | | | don't break with srcoll events on empty message lists | Daniel Gultsch | 2016-03-03 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 1 | -6/+9 |
| | | | | | |||||
| | * | | | properly persist accepted crypto targets | Daniel Gultsch | 2016-03-01 | 1 | -5/+1 |
| | | | | | |||||
| | * | | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 2 | -16/+38 |
| | | | | | | | | | | | | | | | | | already trusted | ||||
| | * | | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 2 | -77/+100 |
| | | | | | |||||
| | * | | | 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 | ||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |