Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | XmppConnectionService.markMessage moved to MessageUtil | steckbrief | 2016-05-09 | 1 | -1/+2 |
| | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil | ||||
* | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 3 | -4/+20 |
| | | | | | | | | | | | | | | | | 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 branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 3 | -133/+171 |
| | |||||
* | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 9 | -0/+2242 |