| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.11.3' into trz/rebase | lookshe | 2016-04-05 | 1 | -9/+11 |
| |\ | |||||
| | * | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 1 | -4/+7 |
| | | | |||||
| | * | add methods to check max file size for http upload | Daniel Gultsch | 2016-03-31 | 1 | -2/+1 |
| | | | |||||
| | * | save otr fingerprint in message | Daniel Gultsch | 2016-03-31 | 1 | -2/+2 |
| | | | |||||
| | * | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-30 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 1 | -1/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Typo `attempt` | licaon-kter | 2016-03-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | be more careful to avoid creating multiple connections | Daniel Gultsch | 2016-03-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-22 | 1 | -1/+5 |
| |\ \ \ | | |/ | |/| | |||||
| * | | | fixed merge errors | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -3/+2 |
| |\| | | |||||
| * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 1 | -25/+15 |
| |\| | | | | | | | | | | | | | | 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 | -19/+21 |
| |\| | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java | ||||
| * | | | Merge tag '1.11.0' into trz/merge_1.11.0 | lookshe | 2016-03-08 | 1 | -19/+63 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
| * | | | 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 | 1 | -15/+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 | 1 | -1/+3 |
| | | | | |||||
| * | | | Unused imports / methods removed | steckbrief | 2016-02-24 | 1 | -3/+0 |
| | | | | |||||
| * | | | 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 | 1 | -26/+90 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | 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 | 1 | -28/+118 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+4 |
| | | | | |||||
| | * | | add more fault tolerant checks for messages left on server | Daniel Gultsch | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | refactored disco cache. avoid making duplicate call. check hash | Daniel Gultsch | 2016-02-03 | 1 | -1/+58 |
| | | | | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |