| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Implements FS#217: Rework display of /me messagesmessage_display_rework | steckbrief | 2016-06-12 | 1 | -124/+153 |
| | | |||||
| * | Related to FS#140: avatar dimensions moved from hardcoded to dimens.xml | steckbrief | 2016-06-07 | 2 | -3/+3 |
| | | |||||
| * | Related to FS#140, Logo implementation moved to FloatingActionButton | steckbrief | 2016-06-07 | 12 | -204/+110 |
| | | | | | | - Appcompat v7 dependency added - References adjusted to work correctly with appcompat v7 | ||||
| * | Open conference details or contact details while clicking on avatar logo | steckbrief | 2016-05-17 | 2 | -4/+82 |
| | | |||||
| * | Do not show contact's avatar on every message, avoid loading own avatar, ↵ | steckbrief | 2016-05-16 | 1 | -28/+33 |
| | | | | | only register click listeners when avatar is present | ||||
| * | avatar displayed as a circle, positioning adjusted, colors changed back to ↵ | steckbrief | 2016-05-16 | 4 | -52/+159 |
| | | | | | correct ones, positioning moved to own class file | ||||
| * | Merge branch 'master' into message_display_rework | steckbrief | 2016-05-13 | 27 | -178/+657 |
| |\ | |||||
| | * | XmppConnectionService.markMessage moved to MessageUtil | steckbrief | 2016-05-09 | 13 | -108/+132 |
| | | | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil | ||||
| | * | Fixes FS#204: Observe all used directories | steckbrief | 2016-04-23 | 8 | -48/+138 |
| | | | | | | | | | | | | | | | - Implementing the FileObserver in a separate class, with mask to watch only deletions not everything - Add observation of all directories which could contain a sent/received file - Change observers if the folder names are changed via settings - markMessage method moved from XmppConnectionService to MessageUtil | ||||
| | * | Related to FS#134: check if oldversion is smaller then new version on ↵ | steckbrief | 2016-04-23 | 1 | -2/+1 |
| | | | | | | | | | upgrading c+ db | ||||
| | * | Removed download decision MUST if the message contains jabber:x:oob:oob/urlintroduce_cplus_database_version | steckbrief | 2016-04-19 | 1 | -3/+0 |
| | | | |||||
| | * | Persist Message.treatAsDownloadable | steckbrief | 2016-04-19 | 2 | -2/+15 |
| | | | |||||
| | * | Related to FS#134: Set Message flags according to httpupload hint | steckbrief | 2016-04-19 | 3 | -0/+9 |
| | | | |||||
| | * | Merge branch 'master' into introduce_cplus_database_version | steckbrief | 2016-04-18 | 20 | -188/+384 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml | ||||
| | * | | DatabaseBackend updated to serve Conversatiosn Database version and ↵ | steckbrief | 2016-04-17 | 11 | -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) | ||||
| * | | | Merge branch 'master' into message_display_rework | steckbrief | 2016-04-20 | 28 | -338/+645 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Implements FS#137: build flavors | steckbrief | 2016-04-18 | 2 | -50/+37 |
| | | | | | | | | | | | | | moved Config.java parameters to a flavorable configuration file | ||||
| | * | | Related to FS#199: Removed unnecessary build configuration variable to hide ↵ | steckbrief | 2016-04-18 | 2 | -6/+3 |
| | | | | | | | | | | | | | disable button on foreground service notification | ||||
| | * | | Related to FS#199: Removed unnecessary differentiation between a ↵ | steckbrief | 2016-04-18 | 3 | -16/+1 |
| | | | | | | | | | | | | | conversation with the own account | ||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 20 | -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.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 | ||||
| | | * \ | 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 | ||||
| | * | | | | Fixed null pointer exception in case of IOException before uploading file to ↵ | steckbrief | 2016-04-16 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | http host | ||||
| | * | | | | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message' | steckbrief | 2016-04-07 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| | * | | | Implements FS#187: Add single line copy to logcat view | steckbrief | 2016-04-07 | 3 | -6/+122 |
| | | |/ | |/| | |||||
| | * | | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences | steckbrief | 2016-04-06 | 12 | -144/+134 |
| | | | | |||||
| * | | | basic overlay for avatar as 'logo' added to action bar | steckbrief | 2016-04-06 | 1 | -0/+63 |
| |/ / | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-05 | 17 | -53/+196 |
| |\| | |||||
| | * | fixed installation error "W/PackageManager: Can't install because provider ↵ | 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 | ||||
| | * \ | 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 | ||||
| | * \ \ | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-28 | 1 | -3/+1 |
| | |\ \ \ | |||||
| | * | | | | wrong import in new class | lookshe | 2016-03-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-27 | 1 | -0/+20 |
| | |\ \ \ \ | |||||
| * | | | | | | 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 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | 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 |
| | |_|_|/ |/| | | | |||||
| * | | | | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 16 | -101/+226 |
| | |_|/ |/| | | |||||
| * | | | Merge branch 'master' of repos.thedevstack.de:conversations-plus | steckbrief | 2016-03-28 | 3 | -3/+44 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fixes FS#166 - Images cannot be opened since storing in private image folder | lookshe | 2016-03-27 | 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 |
| |/ / | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-25 | 14 | -38/+83 |
| |\| | |||||
| | * | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 1 | -0/+2 |
| | | | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |