Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 2 | -20/+64 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | moved avatarfetcher reset code to bind | Daniel Gultsch | 2016-03-03 | 1 | -8/+8 |
| | | |||||
| * | avoid unnecessary disconnect. prevent NetworkOnMainThreadException | Daniel Gultsch | 2016-03-03 | 1 | -3/+3 |
| | | |||||
| * | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 1 | -1/+9 |
| | | |||||
| * | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 1 | -5/+5 |
| | | |||||
| * | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 1 | -2/+38 |
| | | |||||
| * | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 1 | -1/+1 |
| |\ | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | ||||
| | * | No possibility of multiple invocation of log export | fiaxh | 2016-02-24 | 1 | -1/+1 |
| | | | |||||
* | | | Implements: FS#142 - Fix Conference notifications | lookshe | 2016-03-06 | 1 | -3/+1 |
| | | | |||||
* | | | Fixes FS#146: Remove Tor-Support | steckbrief | 2016-03-02 | 1 | -4/+0 |
| | | | |||||
* | | | Merge tag '1.10.1' into trz/merge_1.10.1 | steckbrief | 2016-02-28 | 2 | -16/+23 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | execute pending mam queries every time we come online | Daniel Gultsch | 2016-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | made hard coded choice for encryptions more flexible and disable parsing | Daniel Gultsch | 2016-02-24 | 1 | -12/+17 |
| | | | |||||
| * | | set noMessagesLeftOnServer before conference configuration fetch | Daniel Gultsch | 2016-02-23 | 1 | -1/+2 |
| |/ | |||||
| * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 2 | -2/+3 |
| | | |||||
* | | Unused imports / methods removed | steckbrief | 2016-02-24 | 2 | -8/+0 |
| | | |||||
* | | Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵ | steckbrief | 2016-02-24 | 1 | -10/+0 |
| | | | | | | | | for auto downloading image links moved to global Utility Class) | ||||
* | | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 1 | -18/+9 |
| | | | | | | | | XmppConnectionService marked as deprecated | ||||
* | | Removed useless 'button-message' to load more messages. Implementation ↵ | steckbrief | 2016-02-23 | 1 | -3/+1 |
| | | | | | | | | already done with a more convenient method | ||||
* | | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 1 | -16/+4 |
| | | | | | | | | allowMessageCorrection to preferences | ||||
* | | Merge tag '1.10.0' into trz/merge_1.10.0 | lookshe | 2016-02-22 | 2 | -26/+94 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+4 |
| | | | | | | | | left on server | ||||
| * | change uuid when replacing messages | Daniel Gultsch | 2016-02-20 | 1 | -0/+5 |
| | | |||||
| * | don't log start reason | Daniel Gultsch | 2016-02-17 | 1 | -1/+0 |
| | | |||||
| * | fixed regression that caused messages in muc not being send | Daniel Gultsch | 2016-02-17 | 1 | -6/+7 |
| | | |||||
| * | fixed regression that caused ui to redraw a lot | Daniel Gultsch | 2016-02-16 | 1 | -4/+8 |
| | | |||||
| * | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 1 | -0/+4 |
| | | | | | | | | options to settings | ||||
| * | added some OTR logging | Daniel Gultsch | 2016-02-16 | 1 | -1/+7 |
| | | |||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 1 | -4/+9 |
| | | |||||
| * | optional mode to close tcp connection when going into background | Daniel Gultsch | 2016-02-14 | 1 | -9/+23 |
| | | | | | | | | acts only when push is available. disable all non-push accounts to test properly | ||||
| * | fixed compile bug in free version | Daniel Gultsch | 2016-02-13 | 1 | -2/+2 |
| | | |||||
| * | push gcm token on bind instead of every connect | Daniel Gultsch | 2016-02-12 | 1 | -5/+3 |
| | | |||||
| * | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 1 | -4/+27 |
| | | |||||
* | | Merge tag '1.9.4' into trz/merge_1.9.4 | lookshe | 2016-02-16 | 2 | -57/+151 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | send muc messages after join | Daniel Gultsch | 2016-02-10 | 1 | -1/+2 |
| | | |||||
| * | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 1 | -0/+27 |
| | | |||||
| * | fixed performance regression in on scroll listener | Daniel Gultsch | 2016-02-04 | 1 | -2/+2 |
| | | |||||
| * | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 2 | -8/+13 |
| | | |||||
| * | add more fault tolerant checks for messages left on server | Daniel Gultsch | 2016-02-04 | 2 | -7/+12 |
| | | |||||
| * | count all messages in a query | Daniel Gultsch | 2016-02-03 | 1 | -4/+1 |
| | | |||||
| * | Revert "get rid of broken totalMessageCount for mam queries" | Daniel Gultsch | 2016-02-03 | 1 | -2/+12 |
| | | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f. | ||||
| * | refactored disco cache. avoid making duplicate call. check hash | Daniel Gultsch | 2016-02-03 | 1 | -1/+58 |
| | | |||||
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 1 | -4/+5 |
| |\ | | | | | | | | | | into singpolyma-disco-caps | ||||
| | * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 1 | -4/+5 |
| | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | ||||
| * | | get rid of broken totalMessageCount for mam queries | Daniel Gultsch | 2016-02-02 | 1 | -12/+2 |
| | | | |||||
| * | | avoid npe when accessing the pgp connection service | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 |
| | | | |||||
* | | | Fix flagging no more messages on server for conversation | steckbrief | 2016-02-13 | 1 | -16/+18 |
| | | | |||||
* | | | Unused preference 'picture_compression'. This feature is configured in our ↵ | steckbrief | 2016-02-13 | 1 | -4/+0 |
| | | | | | | | | | | | | variant via 'resize_picture' | ||||
* | | | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵ | steckbrief | 2016-02-13 | 1 | -5/+3 |
| | | | | | | | | | | | | generator classes. |