aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-219-45/+34
| |\ \
| * \ \ Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keycha...Tim Bray2014-11-193-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
| | * | | | Update libsDominik Schürmann2014-11-182-0/+0
| * | | | | 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
| |/ / /
| * | | 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
| | * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-077-21/+885
* | | | | add unit test for "no expiry where revoked user id still has expiry" caseVincent Breitmoser2015-02-261-2/+14
* | | | | 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-264-26/+47
* | | | | | | 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-2581-64/+52
* | | | | Other icon for key exchangeDominik Schürmann2015-02-2530-7/+6
* | | | | 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-2514-4/+5
* | | | | Fix menuDominik Schürmann2015-02-251-0/+2
* | | | | Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-2521-859/+305
* | | | | Bigger status icon in key viewDominik Schürmann2015-02-25114-53/+97
* | | | | First work on new key view toolbarDominik Schürmann2015-02-2533-930/+599
* | | | | 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-236-98/+62
* | | | | Removed submodule android-lockpatternDominik Schürmann2015-02-234-984/+0
* | | | | Update tab lib and fix colors of tabsDominik Schürmann2015-02-234-5/+12
* | | | | Disable default yubikey PIN by defaultDominik Schürmann2015-02-221-1/+1
* | | | | Fix multi select and more colorsDominik Schürmann2015-02-2216-20/+18
* | | | | Pull from transifexDominik Schürmann2015-02-221-1/+1
* | | | | Pull from transifexDominik Schürmann2015-02-2298-903/+4356
* | | | | Fix back button in encrypt activitiesDominik Schürmann2015-02-221-6/+12
* | | | | Color for holoDominik Schürmann2015-02-221-1/+1
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-223-4/+14
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1047 from steelman/dev-stringsDominik Schürmann2015-02-223-4/+14
| |\ \ \ \ \