Commit graph

218 commits

Author SHA1 Message Date
Christian S
4d4ec6824b Merge remote-tracking branch 'refs/remotes/siacs/master' into development 2016-04-09 20:46:13 +02:00
Daniel Gultsch
c22b384680 increase version code to fix nasty bug in 1.11.5 beta 2016-04-08 18:29:32 +02:00
Daniel Gultsch
7a84cfdfa2 version bump to 1.11.5 + changelog 2016-04-08 10:41:55 +02:00
Christian S
103ed1f340 Merge remote-tracking branch 'siacs/master' into development 2016-04-07 20:29:46 +02:00
Christian S
6291c64dd7 Merge remote-tracking branch 'refs/remotes/siacs/master' into development 2016-04-07 20:24:29 +02:00
Daniel Gultsch
b4ad2de2e5 version bump to 1.11.4 + changelog 2016-04-05 23:10:55 +02:00
Daniel Gultsch
a968260b18 fixing travis 2016-04-04 21:25:44 +02:00
Daniel Gultsch
5eedce91f9 version bump to 1.11.3 and changelog 2016-04-02 18:09:07 +02:00
Christian S
1d458e8ab3 Update ShortcutBadger to version 1.1.4 2016-03-27 20:17:51 +02:00
Christian S
2b32a82a13 Merge remote-tracking branch 'refs/remotes/origin/patch-2' into development 2016-03-27 20:08:43 +02:00
Christian S
083738f370 Update ShortcutBadger to version 1.1.4 2016-03-27 20:04:55 +02:00
Christian S
927dde01a8 Merge branch 'siacs/master' into development 2016-03-26 11:17:48 +01:00
Daniel Gultsch
46be514b4d version bump to 1.11.2 and changelog 2016-03-23 19:24:54 +01:00
Daniel Gultsch
564113669e update build deps 2016-03-23 12:04:23 +01:00
Christian S
67eb44af3c version bump 2016-03-23 11:52:32 +01:00
Christian S
5ae161a593 Merge branch 'siacs/master' into development 2016-03-17 20:26:23 +01:00
Daniel Gultsch
c4b1f6171d version bump to 1.11.1 and changelog 2016-03-16 18:12:36 +01:00
Christian S
ecbf5f6459 Merge branch 'siacs/master' into development 2016-03-13 12:07:28 +01:00
Daniel Gultsch
1e75283250 version bump to 1.11.0 2016-03-07 11:06:41 +01:00
Christian S
73907600fa version bump 2016-03-05 19:46:41 +01:00
Christian S
7412b0634f Merge branch 'siacs/master' into development 2016-03-05 10:42:44 +01:00
Daniel Gultsch
8339ebf3dc version bump to 1.11.0-beta.3 2016-03-05 09:49:43 +01:00
Christian S
c18696c85d Merge branch 'siacs/master' into development 2016-03-04 10:16:11 +01:00
Daniel Gultsch
cc67bfd8db version bump to 1.11.0-beta.2 2016-03-03 14:07:48 +01:00
Daniel Gultsch
ab4d86dde7 version bump to 1.11.0-beta, changelog and updated readme 2016-03-01 11:44:51 +01:00
Christian S
ff337163b7 Merge branch 'siacs/master' into development 2016-02-27 10:57:11 +01:00
Daniel Gultsch
c393e60891 version bump to 1.10.1 and changelog 2016-02-26 09:53:02 +01:00
Christian S
5707bb9754 Merge branch 'siacs/master' into development 2016-02-23 17:47:03 +01:00
Daniel Gultsch
20eebe638b Revert "disable predexing on travis"
This reverts commit ad063d00cc.
2016-02-23 14:33:03 +01:00
Daniel Gultsch
ad063d00cc disable predexing on travis 2016-02-23 14:25:13 +01:00
Daniel Gultsch
c20d8ac69e version bump to 1.10.0 2016-02-21 23:03:30 +01:00
Christian S
fe52f30c5b Merge branch 'siacs/master' into development 2016-02-20 15:28:01 +01:00
Daniel Gultsch
726393f8da version bump to 1.10.0-beta and changelog 2016-02-16 12:59:54 +01:00
Christian S
5e64737d53 Merge branch 'siacs/master' into development 2016-02-14 17:00:16 +01:00
Daniel Gultsch
6217e33a87 removed gcm plugin from gradle. fixes #1693 2016-02-12 23:38:30 +01:00
Daniel Gultsch
32da65f910 client side support for XEP-0357: Push Notifications 2016-02-12 11:39:27 +01:00
Daniel Gultsch
d58d822215 version bump to 1.9.4 + changelog 2016-02-11 17:13:17 +01:00
Christian S
14b688e0fb Merge remote-tracking branch 'siacs/master' into development 2016-02-04 18:02:03 +01:00
Daniel Gultsch
ae83efe4a6 version bump to 1.9.3 2016-02-01 14:25:59 +01:00
Christian S
0196442c37 Merge branch 'siacs/master' into development 2016-01-23 12:30:02 +01:00
Daniel Gultsch
62a88a4db8 version bump to 1.9.2 + changelog 2016-01-20 17:30:33 +01:00
Christian S
ae60bc2651 Merge branch 'siacs/master' into development 2016-01-17 11:46:10 +01:00
Christian S
7b6b95caaf Merge branch 'siacs/master' into development 2016-01-16 10:59:08 +01:00
Adithya Abraham Philip
f64018d0a2 upgraded to OpenKeychain api v10 2016-01-16 04:26:01 +05:30
Daniel Gultsch
ca7b397828 version bump to 1.9.1 2016-01-15 23:48:04 +01:00
Christian S
188e0a118c Merge branch 'siacs/master' into development 2016-01-15 18:19:00 +01:00
Daniel Gultsch
0dede0e1de version bump to 1.9.0 2016-01-14 20:51:09 +01:00
Christian S
4c2dc70828 Merge branch 'siacs/master' into development 2016-01-13 17:48:30 +01:00
Daniel Gultsch
3b3aa5b584 version bump to 1.9.0-beta.3 2016-01-13 12:20:24 +01:00
Daniel Gultsch
64420f79e5 version bump to 1.9.0-beta.2 2016-01-12 16:39:04 +01:00