Commit Graph

216 Commits

Author SHA1 Message Date
Dominik Schürmann
efb1868791 Fix merge conflicts 2016-11-30 13:46:50 +01:00
Dominik Schürmann
d826e2c32e Merge branch 'import-refactor' 2016-11-30 01:01:22 +01:00
Dominik Schürmann
c3c1568de1 Add flattr 2016-11-07 22:27:27 +01:00
Dominik Schürmann
148f3f49bf Remove deprecated incremental option 2016-10-28 15:08:27 +02:00
Dominik Schürmann
0ae3dc7736 Re-enable gradle witness 2016-10-28 15:04:32 +02:00
Dominik Schürmann
e9446308d4 Update dependencies 2016-10-28 15:02:25 +02:00
Dominik Schürmann
0dbe067ade Resolve merge conflicts 2016-10-27 19:03:37 +02:00
Tobias Erthal
da543345ee Reintroduce changes made associated with KeyListFragment to new branch. 2016-09-25 17:26:51 +02:00
Dominik Schürmann
bf382ec59d Update PayPal email 2016-08-26 10:01:28 +02:00
Andrea Torlaschi
d9562461eb ImportKeys: Add empty list message 2016-08-19 22:35:28 +02:00
Dominik Schürmann
0733984e3f 4.2 beta1 2016-08-15 14:31:45 +02:00
Dominik Schürmann
ac1c20f961 Update build environment to SDK 24 2016-08-15 08:37:23 +02:00
Dominik Schürmann
356eb23c5d Merge pull request #1886 from runnerway/test-01
Instrumented unit tests: fix for execution
2016-08-15 08:11:48 +02:00
Dominik Schürmann
907e8aa6e6 Version 4.1 2016-08-08 17:56:42 +02:00
Andrea Torlaschi
6cecb42389 androidTest: Add proguard file for test
For now we use the same as for other configurations.
2016-07-12 21:43:12 +02:00
Dominik Schürmann
0011c5adac Version 4.1 beta3 2016-07-07 15:59:35 +02:00
Dominik Schürmann
826607db56 Version 4.0.3 2016-07-07 15:57:27 +02:00
Dominik Schürmann
fe453ff011 Version 4.1 beta2 2016-07-07 14:43:06 +02:00
Dominik Schürmann
b9fcd298df Version 4.0.2 2016-07-07 14:36:15 +02:00
Dominik Schürmann
72da8e98a6 4.1 beta1 2016-06-07 22:15:58 +02:00
Dominik Schürmann
df8081012f Version 4.0.1 2016-05-19 21:09:51 +03:00
Dominik Schürmann
583d4499c6 Decrease javaMaxHeapSize, fix F-Droid build 2016-05-19 21:08:58 +03:00
Dominik Schürmann
867764bbfd Version 4.0 2016-05-18 12:43:10 +03:00
Nikita Mikhailov
bfa18dc79e Add new build type to mitigate debugging issues 2016-05-17 01:21:29 +06:00
Dominik Schürmann
6f35a5565a Version 3.9.6 beta 2016-05-05 14:41:46 +03:00
Dominik Schürmann
9930d67521 Update more libraries 2016-04-29 21:09:20 +02:00
Dominik Schürmann
8e0324dbd8 Update build config, gitignore after testing 2016-04-29 17:27:28 +02:00
Dominik Schürmann
19e6103e5f Update libraries, add proguard filters to be under 64K limit 2016-04-29 17:03:50 +02:00
Dominik Schürmann
5fdc312b2d Version 3.9.5 2016-04-29 13:16:32 +02:00
Dominik Schürmann
a16c4bcc30 Version 3.95 beta 2016-04-13 17:12:48 +02:00
Dominik Schürmann
8bcd4003a9 KeybaseLib workaround 2016-04-12 19:42:54 +02:00
Dominik Schürmann
115c46d015 Update Android Gradle Plugin to 2.0 with workarounds 2016-04-12 19:28:00 +02:00
Dominik Schürmann
f7654af00b Revert usage of masked-edittext, back to plain edittexts for backup codes 2016-04-12 19:06:08 +02:00
Michal Kepkowski
d9988a8cda Merge branch 'master' into okhttp3 2016-04-06 19:16:10 +02:00
Vincent Breitmoser
4c61b4c892 use new TokenAutoComplete 2.0.7, fixes #1636 2016-03-23 22:46:25 +01:00
Dominik Schürmann
f3712101c1 Version 3.9.4 2016-03-15 23:53:03 +01:00
Dominik Schürmann
2b43ba438b Version 3.9.3 2016-03-15 18:01:27 +01:00
Michal Kepkowski
6c2efb0235 okhttp3 2016-03-14 17:41:18 +01:00
Dominik Schürmann
48867e89bd Update okhttp2, tokenautomcomplete, zxing 2016-03-10 12:25:13 +01:00
Dominik Schürmann
c419942a3f Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain into kepuss-okHttpLinkedToken 2016-03-07 00:37:35 +01:00
Dominik Schürmann
4a3cd716eb Version 3.9.2 2016-03-07 00:24:13 +01:00
Dominik Schürmann
3f746bd281 Version 3.9.1 2016-03-06 14:14:34 +01:00
Michal Kepkowski
852ccc3f8f dependency removed 2016-03-05 16:23:53 +01:00
Dominik Schürmann
eef8abcf80 Version 3.9 2016-03-03 13:34:08 +01:00
Dominik Schürmann
067d5fd0b0 Comment out verification for submodules 2016-02-29 23:15:27 +01:00
Dominik Schürmann
3fd5f2c097 Update to support lib 23.2.0 2016-02-29 23:13:51 +01:00
Dominik Schürmann
923b543e4d Add masked-edittext library 2016-02-10 18:48:27 +01:00
Theo Franzén
0191cf92db Better transaction animation 2016-02-10 15:28:59 +01:00
Dominik Schürmann
b44f73c819 Fix jacoco task 2016-02-09 21:02:43 +01:00
Dominik Schürmann
2bf9634fd6 Add donation fragment 2016-02-09 20:48:24 +01:00