aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Implements FS#137: build flavorssteckbrief2016-04-181-0/+1
| | | | moved Config.java parameters to a flavorable configuration file
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-3/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.7lookshe2016-04-171-3/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * version bump to 1.11.7 + changelogDaniel Gultsch2016-04-141-2/+2
| | |
| | * version bump to 1.11.6 + changelogDaniel Gultsch2016-04-101-2/+2
| | |
| | * update gradle and gradle pluginDaniel Gultsch2016-04-091-1/+1
| | |
| | * increase version code to fix nasty bug in 1.11.5 betaDaniel Gultsch2016-04-081-1/+1
| | |
| | * version bump to 1.11.5 + changelogDaniel Gultsch2016-04-081-2/+2
| | |
| | * version bump to 1.11.4 + changelogDaniel Gultsch2016-04-051-2/+2
| | |
| | * fixing travisDaniel Gultsch2016-04-041-0/+11
| | |
| * | update to beta-2 and new logo for betalookshe2016-04-061-2/+2
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-1/+1
|\| |
| * | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-2/+2
| |\|
| | * version bump to 1.11.3 and changelogDaniel Gultsch2016-04-021-2/+2
| | |
| | * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-1/+1
| | |
| * | update build.gradle for betalookshe2016-04-031-2/+2
| | |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-1/+1
| |\ \ | |/ / |/| |
* | | adjusted changelog and corrected wrong version in build.gradle due to merge0.0.7lookshe2016-03-271-2/+2
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-3/+3
|\| |
| * | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-3/+3
| |\|
| | * version bump to 1.11.2 and changelogDaniel Gultsch2016-03-231-2/+2
| | |
| | * update build depsDaniel Gultsch2016-03-231-2/+2
| | |
* | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-2/+2
|\| |
| * | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
| | * version bump to 1.11.1 and changelogDaniel Gultsch2016-03-161-2/+2
| | |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+0
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
* | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-111-1/+0
| | |
* | | incremented version code0.0.6lookshe2016-03-081-1/+1
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-11/+1
|\| |
| * | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-13/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java 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-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/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 src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| | * version bump to 1.11.0Daniel Gultsch2016-03-071-2/+2
| | |
| | * version bump to 1.11.0-beta.3Daniel Gultsch2016-03-051-2/+2
| | |
| | * version bump to 1.11.0-beta.2Daniel Gultsch2016-03-031-2/+2
| | |
| | * version bump to 1.11.0-beta, changelog and updated readmeDaniel Gultsch2016-03-011-2/+2
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-0/+1
|\| |
| * | Fixes FS#150 - Swipe out conversation kills applookshe2016-03-071-0/+1
| | | | | | | | | | | | stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
* | | Version bump to 0.0.6steckbrief2016-03-061-2/+2
|/ /
* | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * version bump to 1.10.1 and changelogDaniel Gultsch2016-02-261-2/+2
| |
| * Revert "disable predexing on travis"Daniel Gultsch2016-02-231-102/+94
| | | | | | | | This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28.
| * disable predexing on travisDaniel Gultsch2016-02-231-94/+102
| |
* | Explicit applicationId removedsteckbrief2016-02-231-1/+0
| |
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-12/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml 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-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * version bump to 1.10.0Daniel Gultsch2016-02-211-2/+3
| |
| * version bump to 1.10.0-beta and changelogDaniel Gultsch2016-02-161-2/+2
| |
| * removed gcm plugin from gradle. fixes #1693Daniel Gultsch2016-02-121-4/+2
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-20/+17
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * version bump to 1.9.4 + changelogDaniel Gultsch2016-02-111-2/+2
| |
* | Fixed runtime errors with axolotl libraries.steckbrief2016-02-121-0/+1
| | | | | | | | Now the libraries from maven are added.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 11:52:35 +0000