Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 |
* | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 37 | -651/+1303 |
|\ | |||||
| * | 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 |
| | |\ \ | |||||
| | | * | | 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 |
| | | |\ \ | |||||
| | | * | | | 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 https://github.com/open-keychain/open-keycha... | Tim Bray | 2014-11-19 | 3 | -2/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ... | Dominik Schürmann | 2014-11-19 | 3 | -3/+21 |
| | | |\ \ \ | |||||
| | | * | | | | 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 grace... | Tim Bray | 2014-11-19 | 3 | -1/+9 |
| | | |/ / / | | |/| | | | |||||
| | * | | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ... | Tim Bray | 2014-11-18 | 3 | -3/+21 |
| | |/ / / | |||||
| | * | | | 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 |
| * | | | | | add unit test for "no expiry where revoked user id still has expiry" case | Vincent Breitmoser | 2015-02-26 | 1 | -2/+14 |
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Vincent Breitmoser | 2015-02-26 | 311 | -600/+6 |
| |\ \ \ \ \ | |||||
| * | | | | | | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 4 | -26/+47 |
| * | | | | | | 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 |
* | | | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
* | | | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 835 | -5627/+14491 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 dev... | Dominik Schürmann | 2015-02-26 | 1 | -4/+5 |
| |\| | | | | | |||||
| | * | | | | | pre-select certification key if only one is available | Vincent Breitmoser | 2015-02-26 | 1 | -4/+5 |
| * | | | | | | Hopefully fixes drop down icon for spinners on Android lower 5 | Dominik Schürmann | 2015-02-26 | 2 | -21/+6 |
| |/ / / / / | |||||
| * | | | | | 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 |
| * | | | | | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 81 | -64/+52 |
| * | | | | | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 30 | -7/+6 |
| * | | | | | 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 | 14 | -4/+5 |