aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * more cleanupDominik Schürmann2014-11-211-14/+9
| * NFC activity designDominik Schürmann2014-11-214-19/+14
| * Minor code cleanupDominik Schürmann2014-11-214-11/+11
* | Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keycha...Tim Bray2014-11-191-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
* | | | 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
|/ /
* | 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
|/
* Version 3.1.2Dominik Schürmann2014-11-021-2/+2
* Pull from transifexDominik Schürmann2014-11-0223-17/+182
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-11-021-18/+39
|\
| * export secret and public keys in separate armored blocksVincent Breitmoser2014-10-311-9/+24
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-3031-116/+486
| |\
| * | forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
* | | ChangelogDominik Schürmann2014-11-021-0/+5
| |/ |/|
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
* | Revert "Version 3.1.1"Dominik Schürmann2014-10-301-2/+2
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
* | Pull from transifexDominik Schürmann2014-10-3027-101/+467
* | Changelog 3.1.1Dominik Schürmann2014-10-302-1/+7
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-304-102/+28
|\|
| * Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
| * remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
| * Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
| * retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
* | Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
|/
* Version 3.1Dominik Schürmann2014-10-261-2/+2
* Pull from transifexDominik Schürmann2014-10-2620-0/+220
* Pull from transifexDominik Schürmann2014-10-2656-878/+3333
* Changelog 3.1Dominik Schürmann2014-10-261-0/+12
* Fix crash with NotFoundExceptionDominik Schürmann2014-10-261-3/+8
* Rename multi certify files to certifyDominik Schürmann2014-10-2612-322/+103
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-268-5/+31
|\
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-263-0/+7
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
| * fix consolidate if no secret key are presentVincent Breitmoser2014-10-261-2/+6
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-2/+2
| |\
| * | prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
* | | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
| |/ |/|
* | 3.1beta1Dominik Schürmann2014-10-261-2/+2
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-263-81/+32
|\
| * Fix decrypt intent apiDominik Schürmann2014-10-261-1/+1
| * Hide keyboard in safe slinger activityDominik Schürmann2014-10-261-0/+1
| * Use new safe slinger activity from share tabDominik Schürmann2014-10-262-80/+30
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 14:50:24 +0000