aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
* | | | forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-283-4/+85
|\ \ \ \
| * | | | control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
* | | | | Update from transifexDominik Schürmann2015-02-281-2/+0
|/ / / /
* | | | Simplify MainActivityDominik Schürmann2015-02-282-52/+23
* | | | 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-274-172/+9
| |\ \ \ \
| * | | | | 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-272-59/+7
| |/ / / / |/| | | |
* | | | | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
* | | | | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-8/+131
|\| | | |
| * | | | show refresh key progress inlineVincent Breitmoser2015-02-272-8/+131
* | | | | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
|/ / / /
* | | / Keybase header textDominik Schürmann2015-02-271-2/+2
| |_|/ |/| |
* | | go to directly to certify screen after nfc importVincent Breitmoser2015-02-274-85/+70
* | | Prettify qr code in advanced key viewDominik Schürmann2015-02-271-7/+23
* | | Uncluttering advanced key viewDominik Schürmann2015-02-273-250/+0
* | | Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
* | | Remove unused BadImportKeyDialogFragmentDominik Schürmann2015-02-271-67/+0
* | | Merge keybase-proof branchDominik Schürmann2015-02-277-11/+805
|\ \ \
| * \ \ Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-051-1/+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-214-25/+20
| |\ \ \ \
| * | | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-192-1/+8
| * | | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-182-3/+20
| * | | | | All keybase proofs now in placeTim Bray2014-11-113-44/+89
| * | | | | Fix a no-result corner case, and make verifications clickableTim Bray2014-11-071-1/+2
| * | | | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-075-21/+732
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-262-5/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove old Holo design resourcesDominik Schürmann2015-02-261-3/+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-261-2/+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-264-42/+309
* | | | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-254-45/+145
* | | | | Invoke NFC buttonDominik Schürmann2015-02-251-0/+28
* | | | | Other icon for key exchangeDominik Schürmann2015-02-251-1/+1
* | | | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-253-42/+58
* | | | | CardView and more header designDominik Schürmann2015-02-254-15/+37
* | | | | Fix menuDominik Schürmann2015-02-251-0/+2