Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | 5 | -7/+5 | |
| |\ \ \ | ||||||
| * | | | | 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 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | 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 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-02-26 | 311 | -600/+6 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | development | |||||
| * | | | | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 309 | -579/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-26 | 1 | -4/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | development | |||||
| * | | | | | | Hopefully fixes drop down icon for spinners on Android lower 5 | Dominik Schürmann | 2015-02-26 | 2 | -21/+6 | |
| | | | | | | | ||||||
* | | | | | | | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 3 | -6/+27 | |
| | | | | | | | ||||||
* | | | | | | | save revocation instead of self-cert for revoked uids | Vincent Breitmoser | 2015-02-26 | 1 | -12/+19 | |
| | | | | | | | ||||||
* | | | | | | | ignore revoked user ids for primary key expiry | Vincent Breitmoser | 2015-02-26 | 5 | -23/+82 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | pre-select certification key if only one is available | Vincent Breitmoser | 2015-02-26 | 1 | -4/+5 | |
|/ / / / / | ||||||
* | | | | | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 14 | -70/+531 | |
| | | | | | ||||||
* | | | | | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 7 | -54/+155 | |
| | | | | | | | | | | | | | | | | | | | | keys | |||||
* | | | | | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 16 | -2/+38 | |
| | | | | | ||||||
* | | | | | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 29 | -4/+4 | |
| | | | | | ||||||
* | | | | | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 8 | -57/+85 | |
| | | | | | ||||||
* | | | | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 9 | -36/+90 | |
| | | | | | ||||||
* | | | | | Use material icon for safeslinger | Dominik Schürmann | 2015-02-25 | 12 | -3/+3 | |
| | | | | | ||||||
* | | | | | Fix menu | Dominik Schürmann | 2015-02-25 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Toolbar: qr code in header, cleanup of fragment | Dominik Schürmann | 2015-02-25 | 19 | -859/+301 | |
| | | | | | ||||||
* | | | | | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 113 | -48/+83 | |
| | | | | | ||||||
* | | | | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 27 | -103/+403 | |
| | | | | | ||||||
* | | | | | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 9 | -34/+88 | |
| | | | | | ||||||
* | | | | | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 17 | -58/+1014 | |
| | | | | | ||||||
* | | | | | New advanced key view | Dominik Schürmann | 2015-02-23 | 14 | -220/+473 | |
| | | | | | ||||||
* | | | | | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -41/+41 | |
| | | | | | ||||||
* | | | | | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 2 | -137/+142 | |
| | | | | | ||||||
* | | | | | Uncluttering App Settings: Move advanced info in dialog | Dominik Schürmann | 2015-02-23 | 4 | -59/+107 | |
| | | | | | ||||||
* | | | | | Remove unused FixedDrawerLayout | Dominik Schürmann | 2015-02-23 | 1 | -49/+0 | |
| | | | | | ||||||
* | | | | | Remove old pattern lib, add new pattern lib | Dominik Schürmann | 2015-02-23 | 5 | -96/+60 | |
| | | | | | ||||||
* | | | | | Removed submodule android-lockpattern | Dominik Schürmann | 2015-02-23 | 2 | -981/+0 | |
| | | | | | ||||||
* | | | | | Update tab lib and fix colors of tabs | Dominik Schürmann | 2015-02-23 | 3 | -4/+11 | |
| | | | | | ||||||
* | | | | | Disable default yubikey PIN by default | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 15 | -19/+14 | |
| | | | | | ||||||
* | | | | | Pull from transifex | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 | |
| | | | | |