Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 1 | -1/+1 |
| | | | | | | | | | 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 | ||||
* | DatabaseBackend updated to serve Conversatiosn Database version and ↵ | steckbrief | 2016-04-17 | 1 | -0/+15 |
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) |