Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4 | lookshe | 2016-05-26 | 1 | -0/+12 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/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-rBR/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-05-02 | 1 | -0/+12 |
| | | |||||
* | | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -11/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-10 | 1 | -3/+0 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-04-04 | 1 | -8/+12 |
| | | |||||
* | | pulled from transifex | lookshe | 2016-03-23 | 1 | -10/+3 |
|/ | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-03-13 | 1 | -102/+398 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-03-06 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-02-19 | 1 | -6/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 1 | -1/+0 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-12-02 | 1 | -3/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-14 | 1 | -1/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-08-24 | 1 | -2/+0 |
| | |||||
* | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 1 | -2/+2 |
| | |||||
* | sync translations with transifex | Daniel Gultsch | 2015-08-03 | 1 | -2/+0 |
| | |||||
* | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 1 | -0/+297 |