| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 13 | -35/+31 |
| |\ | |||||
| | * | Merge branch 'master' into development | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 |
| | |\ | |||||
| | | * | Add passhrase attacking screens for wiki | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 |
| | | | | |||||
| | * | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix travis | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | | | | |||||
| | * | | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 4 | -8/+6 |
| | | | | |||||
| | * | | Switch from mavenCentral to jcenter | Dominik Schürmann | 2014-12-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix jacoco | Dominik Schürmann | 2014-12-04 | 1 | -24/+23 |
| | | | | |||||
| | * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | development | ||||
| | | * \ | Merge pull request #1011 from cketti/fix_k9_references | Dominik Schürmann | 2014-11-27 | 1 | -3/+3 |
| | | |\ \ | | | | | | | | | | | Fix spelling of 'K-9 Mail' in FAQ | ||||
| | | | * | | Fix spelling of 'K-9 Mail' in FAQ | cketti | 2014-11-26 | 1 | -3/+3 |
| | | |/ / | |||||
| | * | | | Merge branch 'master' into development | Dominik Schürmann | 2014-12-04 | 15 | -43/+42 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version ↵ | Dominik Schürmann | 2014-12-04 | 2 | -36/+35 |
| | | | | | | | | | | | | | | | | | anymore, jacoco disabled for now | ||||
| | | * | | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 |
| | | | | | |||||
| | | * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 3 | -4/+4 |
| | | |/ | |||||
| * | | | Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 2 | -3/+7 |
| |\ \ \ | | | | | | | | | | | | | keybase-proofs | ||||
| | * | | | Check fingerprint match between proof & database | Tim Bray | 2014-11-22 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs | Tim Bray | 2014-11-21 | 1 | -2/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| | * | | | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 2 | -4/+8 |
| | | | | | | |||||
| * | | | | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 |
| | | | | | | |||||
| * | | | | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 3 | -4/+4 |
| | |/ / / |/| | | | |||||
| * | | | | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 4 | -9/+13 |
| | | | | |||||
| * | | | Use master key id for keybase proof verification | Dominik Schürmann | 2014-11-22 | 1 | -10/+4 |
| | | | | |||||
| * | | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 9 | -45/+34 |
| |\| | | |||||
| | * | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 |
| | | | | |||||
| | * | | NFC activity design | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 |
| | | | | |||||
| | * | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 7 | -12/+11 |
| | | | | |||||
| * | | | Merge branch 'keybase-proofs' of ↵ | Tim Bray | 2014-11-19 | 3 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain into keybase-proofs | ||||
| | * \ \ | Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-11-19 | 3 | -3/+21 |
| | |\ \ \ | | | | | | | | | | | | | | | | keybase-proofs | ||||
| | * | | | | Version 3.2beta1 | Dominik Schürmann | 2014-11-18 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Update libs | Dominik Schürmann | 2014-11-18 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 3 | -1/+9 |
| | |/ / / |/| | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| * | | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 3 | -3/+21 |
| |/ / / | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
| * | | | Merge branch 'timbray-development' into keybase-proofs | Dominik Schürmann | 2014-11-12 | 11 | -21/+957 |
| |\ \ \ | |_|/ |/| | | |||||
| | * | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 4 | -44/+96 |
| | | | | |||||
| | * | | Fix a no-result corner case, and make verifications clickable | Tim Bray | 2014-11-07 | 1 | -1/+2 |
| | | | | |||||
| | * | | XML fragment for proof listing | Tim Bray | 2014-11-07 | 1 | -0/+19 |
| | | | | |||||
| | * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 7 | -21/+885 |
| | |/ | |||||
| | * | Update keybase and minidns libs | Dominik Schürmann | 2014-11-04 | 2 | -0/+0 |
| |/ | |||||
| * | Version 3.1.2 | Dominik Schürmann | 2014-11-02 | 1 | -2/+2 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-11-02 | 23 | -17/+182 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-11-02 | 1 | -18/+39 |
| |\ | | | | | | | development | ||||
| | * | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 |
| | | | |||||
| | * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 32 | -116/+490 |
| | |\ | | | | | | | | | | development | ||||
| | * | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| | | | | |||||
| * | | | Changelog | Dominik Schürmann | 2014-11-02 | 2 | -0/+8 |
| | |/ |/| | |||||
| * | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |