aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-183-4/+12
|\ | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| * Related to FS#199: fixed merge hickups (message correction setting removed, ↵steckbrief2016-04-181-2/+0
| | | | | | | | key for other expert settings readded)
| * removed unused stringlookshe2016-04-171-1/+0
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-173-2/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-173-4/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java 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-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| | | * add setting for quick sharingDaniel Gultsch2016-04-141-0/+4
| | | |
| | | * added share uri button to conference detailsDaniel Gultsch2016-04-123-0/+4
| | | |
| | | * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-3/+5
| | | |
| | | * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| | | |
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
| | |\ \ | | |/ / | |/| | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* | | | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| | | |
* | | | conversations->conversations+lookshe2016-04-031-14/+14
| |/ / |/| |
* | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-0/+1
|\| |
| * | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+1
| |\|
| | * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-0/+1
| | |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-2/+2
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-202-0/+7
| |\ \
* | | | pulled from transifexlookshe2016-03-231-2/+2
| |/ / |/| |
* | | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-202-0/+7
| | |
* | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+3
|\| |
| * | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-13/+0
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 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-111-13/+0
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-0/+6
|\| |
| * | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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-041-0/+1
| | |
| | * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+2
| | |
| | * let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-0/+1
| | | | | | | | | | | | already trusted
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-067-298/+436
|\| |
| * | Fixes FS#147: Disable OMEMOsteckbrief2016-03-022-0/+6
| | |
| * | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-3/+0
| | |
| * | externalized string 'Retry decryption'steckbrief2016-02-281-0/+1
| | |
| * | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| | |
| | * Retry decryption from message menufiaxh2016-02-231-1/+0
| | |
| | * 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-231-2/+0
| | |
| * | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-231-1/+0
| | | | | | | | | | | | already done with a more convenient method
| * | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-15/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-4/+4
| | |
| | * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-15/+17
| | | | | | | | | | | | options to settings
| | * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+2
| | |
| | * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 05:25:06 +0000