Art O Cathain
|
63861fa60b
|
Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error
|
2014-06-14 13:16:39 +01:00 |
|
Vincent Breitmoser
|
ca4774fd62
|
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
|
2014-06-13 00:27:40 +02:00 |
|
Vincent Breitmoser
|
97c679ada3
|
import-log: add SuperToast external library
|
2014-06-10 01:24:58 +02:00 |
|
Dominik Schürmann
|
cb3c2b2008
|
Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12
|
2014-06-09 22:09:30 +02:00 |
|
Dominik Schürmann
|
d530a7b0ee
|
Update buildTools to 19.1
|
2014-06-09 21:52:17 +02:00 |
|
mar-v-in
|
36312b950a
|
Add dnsjava as submodule
|
2014-06-05 23:46:14 +02:00 |
|
mar-v-in
|
cae0071342
|
Merge branch 'master' into automatic-contact-discovery
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
|
2014-06-04 21:32:37 +02:00 |
|
Dominik Schürmann
|
52f1f30846
|
Use fixed gradle versions
|
2014-06-04 10:22:05 +02:00 |
|
Dominik Schürmann
|
6cb791d567
|
Use fixed gradle versions
|
2014-06-04 10:21:28 +02:00 |
|
mar-v-in
|
3110122a85
|
Add ability to resolve HkpKeyserver from _hkp._tcp SRV record
|
2014-05-27 19:45:58 +02:00 |
|
Vincent Breitmoser
|
e7fa124108
|
update unit test support in build files
|
2014-05-27 13:52:58 +02:00 |
|
Dominik Schürmann
|
ab1b2df2d6
|
Move API libs and API example into their own git repos
|
2014-05-07 16:51:06 +02:00 |
|
Dominik Schürmann
|
8e645453b1
|
Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint
|
2014-05-02 17:42:40 +02:00 |
|
Dominik Schürmann
|
b1cd669f14
|
Update maven libs and use fixed version
|
2014-04-18 20:54:13 +02:00 |
|
Dominik Schürmann
|
19d3fcec7a
|
Remove unused strings, fix some lint errors, fix some language confusions
|
2014-04-18 20:41:39 +02:00 |
|
Dominik Schürmann
|
f7c243564f
|
Use git submodules for libs, fix compilation, remove library sourcecode
|
2014-04-16 21:49:29 +02:00 |
|
gogowitczak
|
f89ab48d61
|
Fixed gradle localTest bug on Windows.
|
2014-04-06 21:25:46 +02:00 |
|
Dominik Schürmann
|
191dcf0c31
|
Comment out localTest due to bug on windows
|
2014-04-06 20:52:44 +02:00 |
|
Dominik Schürmann
|
6d11371905
|
Rename folder structure from OpenPGP Keychain to OpenKeychain
|
2014-04-06 12:57:42 +02:00 |
|