aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-284-6/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| * | | | control flow for moving the fab up with snackbarVincent Breitmoser2015-02-284-7/+89
| | | | |
* | | | | Update from transifexDominik Schürmann2015-02-2834-238/+1010
|/ / / /
* | | | Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| | | |
* | | | Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| | | |
* | | | padding fixes for key listDominik Schürmann2015-02-281-2/+1
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-5/+32
|\ \ \ \ | | | | | | | | | | | | | | | development
| * \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-02-2715-211/+76
| |\ \ \ \ | | | | | | | | | | | | | | | | | | development
| * | | | | 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 ↵Dominik Schürmann2015-02-275-8/+156
|\| | | | | | | | | | | | | | | | | | | development
| * | | | 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-0513-35/+31
| |\ \ \
| * \ \ \ Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-042-3/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | keybase-proofs
| | * | | | 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
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| | * | | | | Add check that proof & database fingerprints are the sameTim Bray2014-11-212-4/+8
| | | | | | |
| * | | | | | Update for Android Studio 1.0 RCDominik Schürmann2014-12-049-0/+0
| | | | | | |
| * | | | | | Update for Android Studio 1.0 RCDominik Schürmann2014-12-043-4/+4
| | |/ / / / | |/| | | |
| * | | | | fix signature checkDominik Schürmann2014-11-221-2/+2
| |/ / / /
| * | | | 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-219-45/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'keybase-proofs' of ↵Tim Bray2014-11-193-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ürmann2014-11-193-3/+21
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | keybase-proofs
| | * | | | | | Version 3.2beta1Dominik Schürmann2014-11-181-2/+2
| | | | | | | |
| | * | | | | | Update libsDominik Schürmann2014-11-182-0/+0
| | | | | | | |
| * | | | | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵Tim Bray2014-11-193-1/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008.
| * | | | | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵Tim Bray2014-11-183-3/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website
| * | | | | Merge branch 'timbray-development' into keybase-proofsDominik Schürmann2014-11-1211-21/+957
| |\ \ \ \ \
| | * | | | | 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
| | | | | | |