2f5c73746d
Merge branch 'master' into yubikey
2014-07-21 15:11:59 +02:00
f560bc9317
forgot to move test classpath out of root project
2014-07-21 03:59:28 +02:00
3cce00d61e
add lib dependency, update lib
2014-07-16 11:00:32 +02:00
faa8c2baa3
travis: get rid of lint
2014-07-11 16:39:31 +02:00
718acbf954
put unit tests into external module (CAVEAT)
...
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
2014-07-09 16:03:30 +02:00
d044daeedd
get rid of AppMsg library
2014-07-07 17:33:25 +02:00
1b0666e9de
Many changes to file ... and still incomplete
...
- Multi file
- Reworked UI
2014-07-06 02:10:35 +02:00
f3b68a9932
Deprecated Android Bootstrap, thus fixing #597
2014-06-30 19:18:20 +02:00
c865de4002
Merge pull request #686 from mar-v-in/minidns
...
Use minidns instead of dnsjava
2014-06-23 23:16:25 +02:00
2b18dc741a
Switch to dnsjava
2014-06-23 22:02:18 +02:00
e8b96d1035
Disable pre-dexing, causes exceptions on some systems
2014-06-23 13:44:25 +02:00
4cc127e460
Merge pull request #672 from artbristol/functional-testing
...
VERY basic test for save keyring
2014-06-21 21:31:25 +02:00
0af2b27cb3
VERY basic test for save keyring
2014-06-21 17:44:04 +01:00
17f43ad21b
Moved Keybase stuff into KeybaseLib submodule
2014-06-20 09:31:34 -07:00
b1815ef24a
revert to previous min version
2014-06-19 07:52:37 +01:00
d06ba72edc
Start on Robolectric integration test
2014-06-16 18:58:41 +01:00
63861fa60b
Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error
2014-06-14 13:16:39 +01:00
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
97c679ada3
import-log: add SuperToast external library
2014-06-10 01:24:58 +02:00
cb3c2b2008
Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12
2014-06-09 22:09:30 +02:00
d530a7b0ee
Update buildTools to 19.1
2014-06-09 21:52:17 +02:00
36312b950a
Add dnsjava as submodule
2014-06-05 23:46:14 +02:00
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
52f1f30846
Use fixed gradle versions
2014-06-04 10:22:05 +02:00
6cb791d567
Use fixed gradle versions
2014-06-04 10:21:28 +02:00
3110122a85
Add ability to resolve HkpKeyserver from _hkp._tcp SRV record
2014-05-27 19:45:58 +02:00
e7fa124108
update unit test support in build files
2014-05-27 13:52:58 +02:00
ab1b2df2d6
Move API libs and API example into their own git repos
2014-05-07 16:51:06 +02:00
8e645453b1
Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint
2014-05-02 17:42:40 +02:00
b1cd669f14
Update maven libs and use fixed version
2014-04-18 20:54:13 +02:00
19d3fcec7a
Remove unused strings, fix some lint errors, fix some language confusions
2014-04-18 20:41:39 +02:00
f7c243564f
Use git submodules for libs, fix compilation, remove library sourcecode
2014-04-16 21:49:29 +02:00
f89ab48d61
Fixed gradle localTest bug on Windows.
2014-04-06 21:25:46 +02:00
191dcf0c31
Comment out localTest due to bug on windows
2014-04-06 20:52:44 +02:00
6d11371905
Rename folder structure from OpenPGP Keychain to OpenKeychain
2014-04-06 12:57:42 +02:00
Dominik Schürmann