aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+4
|\
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-0/+4
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-252-1/+5
| |\ | |/ |/|
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-252-1/+5
|\ \
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-232-1/+5
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-2332-317/+450
|\ \ \ | | |/ | |/|
| * | pulled from transifexlookshe2016-03-2332-317/+450
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
|\| |
| * | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
| | |
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-206-105/+438
| |\ \
* | \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1lookshe2016-03-201-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
| |\| |
| | * | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| | | | | | | | | | | | | | | | hide own avatar in message display
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-176-105/+438
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
| * | pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-62/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-116-61/+3
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
|\| | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
| * | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| | | | | | | | | | | | | | Conflicts: build.gradle
| * | Merge remote branch 'master'steckbrief2016-03-082-4/+0
| |\ \
| * | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
| | | |
* | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-082-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
| |/ /
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0838-131/+319
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-9/+0
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06167-2197/+7492
| |\ \ \
* | \ \ \ Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0838-131/+319
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| | | |
| * | | warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| | | |
| * | | show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| | | |
| * | | don't automatically crop avatarDaniel Gultsch2016-03-047-0/+9
| | | |
| * | | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-012-0/+8
| | | |
| * | | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-012-26/+35
| | | | | | | | | | | | | | | | already trusted
| * | | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-26/+34
| | | |
* | | | Finally fixes FS#142lookshe2016-03-072-9/+0
| |_|/ |/| |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-025-3/+16
| | |
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0224-72/+2
| | |
* | | externalized string 'Retry decryption'steckbrief2016-02-283-1/+3
| | |
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-283-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| | |
| * | Retry decryption from message menufiaxh2016-02-232-1/+4
| | |
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
| | |
* | | Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
| | |
* | | Removed stupid message correctionsteckbrief2016-02-2328-57/+0
| | |
* | | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-2316-24/+0
| | | | | | | | | | | | already done with a more convenient method
* | | merged string resourcessteckbrief2016-02-232-6/+0
| | |
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2261-202/+1709
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 19:17:47 +0000