aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-5/+32
|\ \ \ \
| * \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-2715-211/+76
| |\ \ \ \
| * | | | | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| * | | | | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| * | | | | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
* | | | | | Reorder advanced key viewDominik Schürmann2015-02-274-111/+7
| |/ / / / |/| | | |
* | | | | Enable multi line snackbar optionDominik Schürmann2015-02-272-2/+6
* | | | | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-273-208/+27
* | | | | Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-2710-5/+47
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-275-8/+156
|\| | | |
| * | | | show refresh key progress inlineVincent Breitmoser2015-02-275-8/+156
* | | | | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
|/ / / /
* | | | Keybase header textDominik Schürmann2015-02-275-107/+129
* | | | Better qr code resizingDominik Schürmann2015-02-276-5/+48
| |_|/ |/| |
* | | go to directly to certify screen after nfc importVincent Breitmoser2015-02-275-94/+79
* | | Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
* | | Prettify qr code in advanced key viewDominik Schürmann2015-02-272-12/+50
* | | Uncluttering advanced key viewDominik Schürmann2015-02-275-383/+0
* | | Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
* | | Remove unused BadImportKeyDialogFragmentDominik Schürmann2015-02-271-67/+0
* | | Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
* | | Merge keybase-proof branchDominik Schürmann2015-02-2710-11/+987
|\ \ \
| * \ \ Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-056-12/+10
| |\ \ \
| * | | | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| * | | | Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofsTim Bray2014-11-211-2/+1
| |\ \ \ \
| | * | | | fix signature checkDominik Schürmann2014-11-221-2/+2
| * | | | | Add check that proof & database fingerprints are the sameTim Bray2014-11-212-4/+8
| |/ / / /
| * | | | Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-224-9/+13
| * | | | Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
| * | | | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-218-44/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keycha...Tim Bray2014-11-191-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ...Dominik Schürmann2014-11-193-3/+21
| | |\ \ \ \ \
| | * | | | | | Version 3.2beta1Dominik Schürmann2014-11-181-2/+2
| * | | | | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-193-1/+9
| | |/ / / / / | |/| | | | |
| * | | | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-183-3/+21
| |/ / / / /
| * | | | | All keybase proofs now in placeTim Bray2014-11-114-44/+96
| * | | | | Fix a no-result corner case, and make verifications clickableTim Bray2014-11-071-1/+2
| * | | | | XML fragment for proof listingTim Bray2014-11-071-0/+19
| * | | | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-077-21/+885
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-26311-600/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove old Holo design resourcesDominik Schürmann2015-02-26309-579/+0
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-261-4/+5
| |\ \ \ \ \
| * | | | | | Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-262-21/+6
* | | | | | | split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-263-6/+27
* | | | | | | save revocation instead of self-cert for revoked uidsVincent Breitmoser2015-02-261-12/+19
* | | | | | | ignore revoked user ids for primary key expiryVincent Breitmoser2015-02-265-23/+82
| |/ / / / / |/| | | | |
* | | | | | pre-select certification key if only one is availableVincent Breitmoser2015-02-261-4/+5
|/ / / / /
* | | | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-2614-70/+531
* | | | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-257-54/+155
* | | | | Invoke NFC buttonDominik Schürmann2015-02-2516-2/+38