| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | forgot to commit FabContainer | Vincent Breitmoser | 2015-02-28 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 4 | -6/+89 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | |||||
| | * | | | | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 4 | -7/+89 | |
| | | | | | | ||||||
| * | | | | | Update from transifex | Dominik Schürmann | 2015-02-28 | 34 | -238/+1010 | |
| |/ / / / | ||||||
| * | | | | Simplify MainActivity | Dominik Schürmann | 2015-02-28 | 2 | -52/+23 | |
| | | | | | ||||||
| * | | | | Upload new keys to keyserver by default | Dominik Schürmann | 2015-02-28 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | padding fixes for key list | Dominik Schürmann | 2015-02-28 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 2 | -5/+32 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | development | |||||
| | * \ \ \ | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-02-27 | 15 | -211/+76 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | slightly longer color fade duration | Vincent Breitmoser | 2015-02-27 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | * | | | | | transition status color in key view | Vincent Breitmoser | 2015-02-27 | 1 | -3/+30 | |
| | | | | | | | ||||||
| | * | | | | | hand through result in CertifyFingerprintActivity | Vincent Breitmoser | 2015-02-27 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 4 | -111/+7 | |
| | |/ / / / |/| | | | | ||||||
| * | | | | | Enable multi line snackbar option | Dominik Schürmann | 2015-02-27 | 2 | -2/+6 | |
| | | | | | | ||||||
| * | | | | | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 3 | -208/+27 | |
| | | | | | | ||||||
| * | | | | | Fix keyboard overlay bug on top of edittexts | Dominik Schürmann | 2015-02-27 | 10 | -5/+47 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 5 | -8/+156 | |
| |\| | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 5 | -8/+156 | |
| | | | | | | ||||||
| * | | | | | Fix status images in user id adapter | Dominik Schürmann | 2015-02-27 | 1 | -4/+4 | |
| |/ / / / | ||||||
| * | | | | Keybase header text | Dominik Schürmann | 2015-02-27 | 5 | -107/+129 | |
| | | | | | ||||||
| * | | | | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 6 | -5/+48 | |
| | |_|/ |/| | | ||||||
| * | | | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 5 | -94/+79 | |
| | | | | ||||||
| * | | | Prettify qr code cleanup | Dominik Schürmann | 2015-02-27 | 1 | -10/+0 | |
| | | | | ||||||
| * | | | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -12/+50 | |
| | | | | ||||||
| * | | | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 5 | -383/+0 | |
| | | | | ||||||
| * | | | Simplify delete key dialog | Dominik Schürmann | 2015-02-27 | 2 | -4/+9 | |
| | | | | ||||||
| * | | | Remove unused BadImportKeyDialogFragment | Dominik Schürmann | 2015-02-27 | 1 | -67/+0 | |
| | | | | ||||||
| * | | | Fix margins of dialog views | Dominik Schürmann | 2015-02-27 | 6 | -21/+30 | |
| | | | | ||||||
| * | | | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 10 | -11/+987 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 13 | -35/+31 | |
| | |\ \ \ | ||||||
| | * \ \ \ | 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 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | 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 | |
| | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |