aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-0/+23
|\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1844-117/+170
| |\ | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| * | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-172-0/+23
| | | | | | | | | | | | | | | | | | | | | 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)
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-182-8/+1
|\ \ \ | | |/ | |/|
| * | Related to FS#199: fixed merge hickups (message correction setting removed, ↵steckbrief2016-04-182-8/+1
| | | | | | | | | | | | key for other expert settings readded)
| * | removed unused stringlookshe2016-04-171-1/+0
| | |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1744-116/+177
| |\ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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-1744-145/+178
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-15/+26
| | |
| * | added share uri button to conference detailsDaniel Gultsch2016-04-1214-14/+26
| | |
| * | pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| | |
| * | introduced setting to turn of notification ledDaniel Gultsch2016-04-092-4/+11
| | |
| * | pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| | |
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| | |
| * | pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
| | |
* | | 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
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| | |
| * | conversations->conversations+lookshe2016-04-0329-327/+327
| | |
| * | Pulled translations from transifexlookshe2016-04-012-25/+31
| | |
* | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0630-0/+0
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-012-25/+31
|\ \ \
| * | | Pulled translations from transifexlookshe2016-04-012-25/+31
| |/ /
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-1/+1
|\| |
| * | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| | |
* | | 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
| * | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
| | |
* | | 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.1trz/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/rebasetrz/1.11.0.1lookshe2016-03-082-4/+0
|\ \ \ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 15:02:31 +0000