| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 1 | -1/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | forgot to move test classpath out of root project | Vincent Breitmoser | 2014-07-21 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | add lib dependency, update lib | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | put unit tests into external module (CAVEAT) | Vincent Breitmoser | 2014-07-09 | 1 | -7/+0 | |
| |/ | | | | | | | 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. | |||||
| * | Deprecated Android Bootstrap, thus fixing #597 | Daniel Albert | 2014-06-30 | 1 | -1/+0 | |
| | | ||||||
| * | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 1 | -1/+1 | |
| |\ | | | | | Use minidns instead of dnsjava | |||||
| | * | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Disable pre-dexing, causes exceptions on some systems | Dominik Schürmann | 2014-06-23 | 1 | -1/+5 | |
| |/ | ||||||
| * | Merge pull request #672 from artbristol/functional-testing | Dominik Schürmann | 2014-06-21 | 1 | -15/+1 | |
| |\ | | | | | VERY basic test for save keyring | |||||
| | * | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -15/+1 | |
| | | | ||||||
| * | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -0/+1 | |
| |/ | ||||||
| * | revert to previous min version | Art O Cathain | 2014-06-19 | 1 | -1/+1 | |
| | | ||||||
| * | Start on Robolectric integration test | Art O Cathain | 2014-06-16 | 1 | -30/+23 | |
| | | ||||||
| * | Later version of Junit prevents 'Multiple dex files define ↵ | Art O Cathain | 2014-06-14 | 1 | -1/+1 | |
| | | | | | Lorg/hamcrest/Description' error | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -5/+6 | |
| |\ | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 | Dominik Schürmann | 2014-06-09 | 1 | -4/+4 | |
| | | | ||||||
| | * | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -36/+25 | |
| | |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV record | mar-v-in | 2014-05-27 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 1 | -0/+3 | |
| | |/ |/| | ||||||
| * | | Use fixed gradle versions | Dominik Schürmann | 2014-06-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Use fixed gradle versions | Dominik Schürmann | 2014-06-04 | 1 | -2/+4 | |
| | | | ||||||
| * | | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 1 | -36/+23 | |
| |/ | ||||||
| * | Move API libs and API example into their own git repos | Dominik Schürmann | 2014-05-07 | 1 | -4/+4 | |
| | | ||||||
| * | Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint | Dominik Schürmann | 2014-05-02 | 1 | -1/+12 | |
| | | ||||||
| * | Update maven libs and use fixed version | Dominik Schürmann | 2014-04-18 | 1 | -5/+5 | |
| | | ||||||
| * | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -0/+1 | |
| | | ||||||
| * | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -20/+20 | |
| | | ||||||
| * | Fixed gradle localTest bug on Windows. | gogowitczak | 2014-04-06 | 1 | -13/+13 | |
| | | ||||||
| * | Comment out localTest due to bug on windows | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 | |
| | | ||||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+105 | |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |