aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-062-65/+33
|\ | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
* \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-9/+11
|\ \
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-4/+7
| | |
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-311-2/+1
| | |
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
| | |
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-0/+1
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-1/+2
|\ \ \ | | |/ | |/|
| * | Typo `attempt`licaon-kter2016-03-221-1/+1
| | |
| * | be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-0/+1
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-221-1/+5
|\ \ \ | | |/ | |/|
* | | fixed merge errorslookshe2016-03-201-1/+1
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-151-3/+3
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-3/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-25/+15
|\| | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-35/+44
|\| | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-082-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 bindDaniel Gultsch2016-03-031-8/+8
| | |
| * | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| | |
| * | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-1/+9
| | |
| * | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-5/+5
| | |
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-2/+38
| | |
| * | Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-271-1/+1
| |\ \ | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M
| | * | No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
| | | |
* | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-061-3/+1
| | | |
* | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-4/+0
| | | |
* | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-282-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 #1720Daniel Gultsch2016-02-261-1/+1
| | | |
| * | | execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
| | | |
| * | | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-12/+17
| | | |
| * | | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+2
| |/ /
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-222-2/+3
| | |
* | | Unused imports / methods removedsteckbrief2016-02-242-8/+0
| | |
* | | Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵steckbrief2016-02-241-10/+0
| | | | | | | | | | | | for auto downloading image links moved to global Utility Class)
* | | Packet sending helper moved to XmppSendUtil and methods in ↵steckbrief2016-02-231-18/+9
| | | | | | | | | | | | XmppConnectionService marked as deprecated
* | | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-231-3/+1
| | | | | | | | | | | | already done with a more convenient method
* | | Removed unnecessary dependencies to XmppConnectionService and added ↵steckbrief2016-02-231-16/+4
| | | | | | | | | | | | allowMessageCorrection to preferences
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-222-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 Gultsch2016-02-211-0/+4
| | | | | | | | | | | | left on server
| * | change uuid when replacing messagesDaniel Gultsch2016-02-201-0/+5
| | |
| * | don't log start reasonDaniel Gultsch2016-02-171-1/+0
| | |
| * | fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-6/+7
| | |
| * | fixed regression that caused ui to redraw a lotDaniel Gultsch2016-02-161-4/+8
| | |
| * | added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-0/+4
| | | | | | | | | | | | options to settings
| * | added some OTR loggingDaniel Gultsch2016-02-161-1/+7
| | |
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-4/+9
| | |
| * | optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-9/+23
| | | | | | | | | | | | acts only when push is available. disable all non-push accounts to test properly
| * | fixed compile bug in free versionDaniel Gultsch2016-02-131-2/+2
| | |
| * | push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:02:45 +0000