aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
* Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2824-463/+1033
|\
| * 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
| |\ \ \ \
| * | | | | 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
* | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
* | | | | | merged dialogAdithya Abraham Philip2015-02-2644-1603/+1931
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| |\| | | |
| | * | | | pre-select certification key if only one is availableVincent Breitmoser2015-02-261-4/+5
| * | | | | Hopefully fixes drop down icon for spinners on Android lower 5Dominik Schürmann2015-02-261-2/+6
| |/ / / /
| * | | | 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
| * | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-252-484/+226
| * | | | Bigger status icon in key viewDominik Schürmann2015-02-253-22/+49
| * | | | First work on new key view toolbarDominik Schürmann2015-02-259-72/+299
| * | | | Remove tabs in view keyDominik Schürmann2015-02-2410-45/+644
| * | | | New advanced key viewDominik Schürmann2015-02-238-153/+393
| * | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-41/+41
| * | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-136/+142
| * | | | Uncluttering App Settings: Move advanced info in dialogDominik Schürmann2015-02-232-18/+102
| * | | | Remove unused FixedDrawerLayoutDominik Schürmann2015-02-231-49/+0
| * | | | Remove old pattern lib, add new pattern libDominik Schürmann2015-02-232-47/+22
| * | | | Removed submodule android-lockpatternDominik Schürmann2015-02-232-981/+0
| * | | | Disable default yubikey PIN by defaultDominik Schürmann2015-02-221-1/+1
| * | | | Fix multi select and more colorsDominik Schürmann2015-02-224-7/+3