Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 5 | -7/+5 |
|\ | |||||
| * | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 3 | -3/+1 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| |\ | | | | | | | | | | development | ||||
| | * | 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 | 1 | -3/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | | | |||||
* | | | 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 | ||||
| * | | | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 2 | -4/+8 |
|/ / / | |||||
* | | | 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 | 8 | -44/+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 | 4 | -11/+11 |
| |/ | |||||
* | | Merge branch 'keybase-proofs' of ↵ | Tim Bray | 2014-11-19 | 1 | -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 |
| | | | | |||||
* | | | | 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 | ||||
* | | 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 |
|/ | |||||
* | 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 | 31 | -116/+486 |
| |\ | | | | | | | | | | development | ||||
| * | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| | | | |||||
* | | | Changelog | Dominik Schürmann | 2014-11-02 | 1 | -0/+5 |
| |/ |/| | |||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | | |||||
* | | Revert "Version 3.1.1" | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167. | ||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 |
| | | |||||
* | | Pull from transifex | Dominik Schürmann | 2014-10-30 | 27 | -101/+467 |
| | | |||||
* | | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 2 | -1/+7 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 |
|\| | | | | | | | development | ||||
| * | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 |
| | | | | | | | | Closes #981 | ||||
| * | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 |
| | | |||||
| * | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 |
| | | |||||
| * | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 |
| | | |||||
* | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 |
|/ | |||||
* | Version 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 20 | -0/+220 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 56 | -878/+3333 |
| | |||||
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -0/+12 |
| | |||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 12 | -322/+103 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 8 | -5/+31 |
|\ | | | | | | | development |