aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-0/+1
|\
| * Implements FS#137: build flavorssteckbrief2016-04-181-0/+1
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-3/+14
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-1/+1
| |\
* | \ Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-3/+14
|\ \ \
| * | | version bump to 1.11.7 + changelog1.11.7Daniel Gultsch2016-04-141-2/+2
| * | | version bump to 1.11.6 + changelog1.11.6Daniel 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 beta1.11.5Daniel Gultsch2016-04-081-1/+1
| * | | version bump to 1.11.5 + changelogDaniel Gultsch2016-04-081-2/+2
| * | | version bump to 1.11.4 + changelog1.11.4Daniel Gultsch2016-04-051-2/+2
| * | | fixing travisDaniel Gultsch2016-04-041-0/+11
* | | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-061-2/+2
| |_|/ |/| |
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-2/+2
|\| |
| * | version bump to 1.11.3 and changelog1.11.3Daniel 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 mergelookshe2016-03-271-2/+2
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-3/+3
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-2/+2
| |\ \
* | \ \ FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-3/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | version bump to 1.11.2 and changelog1.11.2Daniel Gultsch2016-03-231-2/+2
| * | update build depsDaniel Gultsch2016-03-231-2/+2
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-2/+2
|\| |
| * | version bump to 1.11.1 and changelog1.11.1Daniel Gultsch2016-03-161-2/+2
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+0
|\ \ \ | | |/ | |/|
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-111-1/+0
| * | incremented version codelookshe2016-03-081-1/+1
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-11/+1
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-0/+1
| |\ \
| * | | Version bump to 0.0.6steckbrief2016-03-061-2/+2
* | | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-13/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | version bump to 1.11.01.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
* | | Fixes FS#150 - Swipe out conversation kills applookshe2016-03-071-0/+1
| |/ |/|
* | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-2/+2
|\|
| * version bump to 1.10.1 and changelog1.10.1Daniel Gultsch2016-02-261-2/+2
| * Revert "disable predexing on travis"Daniel Gultsch2016-02-231-102/+94
| * 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
|\|
| * version bump to 1.10.01.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.4trz/merge_1.9.4lookshe2016-02-161-4/+2
|\|
| * version bump to 1.9.4 + changelog1.9.4Daniel Gultsch2016-02-111-2/+2