Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | version 1.12.0 | Christian S | 2016-04-23 | 1 | -2/+2 | |
| | | ||||||
* | | clean up | Christian S | 2016-04-23 | 1 | -10/+0 | |
| | | ||||||
* | | started 1.11.8-beta | Christian S | 2016-04-23 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-16 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.11.7 + changelog | Daniel Gultsch | 2016-04-14 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-11 | 1 | -3/+3 | |
|\| | ||||||
| * | version bump to 1.11.6 + changelog | Daniel Gultsch | 2016-04-10 | 1 | -2/+2 | |
| | | ||||||
| * | update gradle and gradle plugin | Daniel Gultsch | 2016-04-09 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-09 | 1 | -2/+2 | |
|\| | ||||||
| * | increase version code to fix nasty bug in 1.11.5 beta | Daniel Gultsch | 2016-04-08 | 1 | -1/+1 | |
| | | ||||||
| * | version bump to 1.11.5 + changelog | Daniel Gultsch | 2016-04-08 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-07 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.11.4 + changelog | Daniel Gultsch | 2016-04-05 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-07 | 1 | -0/+11 | |
|\| | ||||||
| * | fixing travis | Daniel Gultsch | 2016-04-04 | 1 | -0/+11 | |
| | | ||||||
| * | version bump to 1.11.3 and changelog | Daniel Gultsch | 2016-04-02 | 1 | -2/+2 | |
| | | ||||||
| * | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into development | Christian S | 2016-03-27 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Update ShortcutBadger to version 1.1.4 | Christian S | 2016-03-27 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 1 | -4/+4 | |
|\| | ||||||
| * | version bump to 1.11.2 and changelog | Daniel Gultsch | 2016-03-23 | 1 | -2/+2 | |
| | | ||||||
| * | update build deps | Daniel Gultsch | 2016-03-23 | 1 | -2/+2 | |
| | | ||||||
* | | version bump | Christian S | 2016-03-23 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.11.1 and changelog | Daniel Gultsch | 2016-03-16 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.11.0 | Daniel Gultsch | 2016-03-07 | 1 | -2/+2 | |
| | | ||||||
* | | version bump | Christian S | 2016-03-05 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.11.0-beta.3 | Daniel Gultsch | 2016-03-05 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -4/+2 | |
|\| | ||||||
| * | version bump to 1.11.0-beta.2 | Daniel Gultsch | 2016-03-03 | 1 | -2/+2 | |
| | | ||||||
| * | version bump to 1.11.0-beta, changelog and updated readme | Daniel Gultsch | 2016-03-01 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.10.1 and changelog | Daniel Gultsch | 2016-02-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 1 | -2/+3 | |
|\| | ||||||
| * | Revert "disable predexing on travis" | Daniel Gultsch | 2016-02-23 | 1 | -102/+94 | |
| | | | | | | | | This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28. | |||||
| * | disable predexing on travis | Daniel Gultsch | 2016-02-23 | 1 | -94/+102 | |
| | | ||||||
| * | version bump to 1.10.0 | Daniel Gultsch | 2016-02-21 | 1 | -2/+3 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 1 | -2/+3 | |
|\| | ||||||
| * | version bump to 1.10.0-beta and changelog | Daniel Gultsch | 2016-02-16 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 1 | -25/+19 | |
|\| | ||||||
| * | removed gcm plugin from gradle. fixes #1693 | Daniel Gultsch | 2016-02-12 | 1 | -4/+2 | |
| | | ||||||
| * | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 1 | -20/+17 | |
| | | ||||||
| * | version bump to 1.9.4 + changelog | Daniel Gultsch | 2016-02-11 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.9.3 | Daniel Gultsch | 2016-02-01 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -2/+2 | |
|\| | ||||||
| * | version bump to 1.9.2 + changelog | Daniel Gultsch | 2016-01-20 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-17 | 1 | -1/+1 | |
|\| |