| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 2 | -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/rebase | steckbrief | 2016-04-07 | 3 | -6/+124 |
| |\ | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java | ||||
| | * | Implements FS#187: Add single line copy to logcat view | steckbrief | 2016-04-07 | 3 | -6/+122 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-06 | 1 | -0/+43 |
| |\| | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | ||||
| | * | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences | steckbrief | 2016-04-06 | 12 | -144/+134 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-05 | 17 | -53/+196 |
| | |\ | |/ |/| | |||||
| | * | Fixes FS#180: Conference notification icon missing | lookshe | 2016-04-01 | 1 | -1/+6 |
| | | | |||||
| | * | Fixes FS#179: Avoid showing always empty list of ressources for mucs | steckbrief | 2016-03-30 | 1 | -1/+3 |
| | | | |||||
| | * | Logging for FS#80 to identify calling method | lookshe | 2016-03-30 | 3 | -0/+6 |
| | | | |||||
| | * | Fixes FS#172: Conversations list not updated on status changes | steckbrief | 2016-03-29 | 1 | -20/+9 |
| | | | |||||
| | * | Removed unnecessary import | steckbrief | 2016-03-29 | 1 | -1/+0 |
| | | | |||||
| * | | fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1 | lookshe | 2016-04-03 | 1 | -20/+0 |
| | | | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus" | ||||
| * | | fixed build error | lookshe | 2016-04-03 | 1 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 1 | -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 | ||||
| | * | Avoid unnecessary text change on activate account button | steckbrief | 2016-03-29 | 1 | -2/+3 |
| | | | |||||
| | * | Introduction of a TextViewUtil to easily set attributes for TextViews | steckbrief | 2016-03-29 | 6 | -69/+99 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 3 | -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 | ||||
| | * | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 16 | -101/+226 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-28 | 1 | -3/+1 |
| |\| | |||||
| | * | Merge branch 'master' of repos.thedevstack.de:conversations-plus | steckbrief | 2016-03-28 | 3 | -3/+44 |
| | |\ | |||||
| | * | | Fixes FS#170: Message Details: Status display has different Text color | steckbrief | 2016-03-28 | 2 | -4/+2 |
| | | | | |||||
| | * | | Implements FS#176: error logging for httpupload improved | steckbrief | 2016-03-28 | 1 | -1/+7 |
| | | | | |||||
| * | | | wrong import in new classtrz/1.11.2.1 | lookshe | 2016-03-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-27 | 1 | -0/+20 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fixes FS#166 - Images cannot be opened since storing in private image folder | lookshe | 2016-03-27 | 3 | -3/+44 |
| | |/ | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-25 | 14 | -38/+83 |
| | |\ | |/ |/| | |||||
| | * | Correct notifications to user if swiping with disabled or not connected ↵ | lookshe | 2016-03-22 | 1 | -25/+37 |
| | | | | | | | | | account (FS#159) | ||||
| | * | Fixes FS#87 - Crash on load messages after delete account | lookshe | 2016-03-22 | 1 | -1/+5 |
| | | | |||||
| | * | One more fix in Message.equals() (FS#104) | lookshe | 2016-03-21 | 1 | -4/+19 |
| | | | |||||
| | * | Show file name instead of mime type (FS#102) | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | |||||
| | * | FS#104 - Fix Message.equals() | lookshe | 2016-03-20 | 1 | -18/+14 |
| | | | |||||
| * | | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -59/+83 |
| |\| | |||||
| | * | Fixes FS#168 - Not possible to share more than one picture at once | lookshe | 2016-03-20 | 1 | -59/+83 |
| | | | |||||
| | * | fixed merge error | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 3 | -19/+27 |
| | |\ | |||||
| | * \ | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 8 | -74/+115 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1 | lookshe | 2016-03-20 | 1 | -0/+20 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -0/+20 |
| | |\| | | | |/ | |/| | |||||
| | | * | Fixes FS#167: Resized images are larger than original images | steckbrief | 2016-03-18 | 1 | -2/+2 |
| | | | | |||||
| | | * | Fixes FS#164 | lookshe | 2016-03-18 | 1 | -8/+0 |
| | | | | |||||
| | | * | Fixes FS#156 and FS#135 (occured again) | lookshe | 2016-03-17 | 1 | -4/+10 |
| | | | | |||||
| | | * | completely implements FS#161 | lookshe | 2016-03-17 | 3 | -14/+41 |
| | | | | | | | | | | | | | save state of treatAsDownloadable() and set on error to specified value | ||||
| | | * | partially implements FS#161 | lookshe | 2016-03-16 | 2 | -17/+49 |
| | | | | | | | | | | | | | do not show download button on 404 | ||||
| | | * | once again: FS#34 - review all calls for String.trim() | lookshe | 2016-03-14 | 2 | -4/+4 |
| | | | | |||||
| * | | | fixed merge errors | lookshe | 2016-03-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 2 | -88/+3 |
| |\| | |||||
| | * | Fixes FS#155: Check FileHelper vs. FileUtils | steckbrief | 2016-03-12 | 5 | -97/+16 |
| | | | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-12 | 7 | -55/+93 |
| | |\ | |/ |/| | |||||
| | * | Fixes FS#51: Change toggle in Account Management back to standard | steckbrief | 2016-03-11 | 3 | -77/+10 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |