aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Removed download decision MUST if the message contains jabber:x:oob:oob/urlsteckbrief2016-04-191-3/+0
|
* Persist Message.treatAsDownloadablesteckbrief2016-04-192-2/+15
|
* Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-193-0/+9
|
* Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1820-188/+384
|\ | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| * Implements FS#137: build flavorssteckbrief2016-04-182-50/+37
| | | | | | | | moved Config.java parameters to a flavorable configuration file
| * Related to FS#199: Removed unnecessary build configuration variable to hide ↵steckbrief2016-04-182-6/+3
| | | | | | | | disable button on foreground service notification
| * Related to FS#199: Removed unnecessary differentiation between a ↵steckbrief2016-04-183-16/+1
| | | | | | | | conversation with the own account
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1720-134/+361
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-073-6/+124
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
| | * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-0/+43
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
* | | | | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-1711-20/+367
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Fixed null pointer exception in case of IOException before uploading file to ↵steckbrief2016-04-161-2/+7
| | | | | | | | | | | | | | | | http host
* | | | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
| |_|/ |/| |
* | | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-073-6/+122
| |/ |/|
* | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
|\|
| * fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1lookshe2016-04-031-20/+0
| | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
| * fixed build errorlookshe2016-04-031-0/+2
| |
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.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/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-293-2/+161
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
| |\ \ \
| * | | | wrong import in new classtrz/1.11.2.1lookshe2016-03-271-1/+1
| | | | |
| * | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+20
| |\ \ \ \
* | | | | | Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
| | | | | |
* | | | | | Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
| | | | | |
* | | | | | Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
| | | | | |
* | | | | | Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
| | | | | |
* | | | | | Removed unnecessary importsteckbrief2016-03-291-1/+0
| |_|_|_|/ |/| | | |
* | | | | Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| | | | |
* | | | | Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-296-69/+99
| |_|_|/ |/| | |
* | | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
| |_|/ |/| |
* | | Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
|\ \ \ | | |/ | |/|
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-273-3/+44
| | |
* | | Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
| | |
* | | Implements FS#176: error logging for httpupload improvedsteckbrief2016-03-281-1/+7
|/ /
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2514-38/+83
|\|
| * FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
| |
| * Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
| |\
| * \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-0/+20
| |\ \
| | * \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-0/+20
| | |\ \
* | | | | Correct notifications to user if swiping with disabled or not connected ↵lookshe2016-03-221-25/+37
| | | | | | | | | | | | | | | | | | | | account (FS#159)
* | | | | Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
| | | | |
* | | | | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| | | | |
* | | | | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| | | | |
* | | | | FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| |_|_|/ |/| | |
* | | | Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
| | | |
* | | | fixed merge errorlookshe2016-03-201-1/+1
| | | |
* | | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
|\| | |
| * | | fixed merge errorslookshe2016-03-201-1/+1
| |/ /