aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* 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-055-7/+5
| |\
| * | 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
| | * | 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 ↵Tim Bray2014-11-191-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
| | | | | |
| * | | | | 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
| * | | 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 ↵Vincent Breitmoser2015-02-26311-600/+6
|\ \ \ \ | | | | | | | | | | | | | | | development
| * | | | Remove old Holo design resourcesDominik Schürmann2015-02-26309-579/+0
| | | | |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-261-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | development
| * | | | | 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
| | | | | | | | | | | | | | | | keys
* | | | Invoke NFC buttonDominik Schürmann2015-02-2516-2/+38
| | | |
* | | | Other icon for key exchangeDominik Schürmann2015-02-2529-4/+4
| | | |
* | | | Design fixes for header, QR Code shared element transitionsDominik Schürmann2015-02-258-57/+85
| | | |
* | | | CardView and more header designDominik Schürmann2015-02-259-36/+90
| | | |
* | | | Use material icon for safeslingerDominik Schürmann2015-02-2512-3/+3
| | | |
* | | | Fix menuDominik Schürmann2015-02-251-0/+2
| | | |
* | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-2519-859/+301
| | | |
* | | | Bigger status icon in key viewDominik Schürmann2015-02-25113-48/+83
| | | |
* | | | First work on new key view toolbarDominik Schürmann2015-02-2527-103/+403
| | | |
* | | | Fix QR Code, design experiments for key viewDominik Schürmann2015-02-249-34/+88
| | | |
* | | | Remove tabs in view keyDominik Schürmann2015-02-2417-58/+1014
| | | |
* | | | New advanced key viewDominik Schürmann2015-02-2314-220/+473
| | | |
* | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-41/+41
| | | |
* | | | Refactor AppsListFragmentDominik Schürmann2015-02-232-137/+142
| | | |
* | | | Uncluttering App Settings: Move advanced info in dialogDominik Schürmann2015-02-234-59/+107
| | | |
* | | | Remove unused FixedDrawerLayoutDominik Schürmann2015-02-231-49/+0
| | | |
* | | | Remove old pattern lib, add new pattern libDominik Schürmann2015-02-235-96/+60
| | | |
* | | | Removed submodule android-lockpatternDominik Schürmann2015-02-232-981/+0
| | | |
* | | | Update tab lib and fix colors of tabsDominik Schürmann2015-02-233-4/+11
| | | |
* | | | Disable default yubikey PIN by defaultDominik Schürmann2015-02-221-1/+1
| | | |
* | | | Fix multi select and more colorsDominik Schürmann2015-02-2215-19/+14
| | | |