aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Pull from transifexDominik Schürmann2014-11-0223-17/+182
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-11-021-18/+39
|\ | | | | | | development
| * 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 ↵Vincent Breitmoser2014-10-3031-116/+486
| |\ | | | | | | | | | development
| * | 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
| | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167.
* | 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 ↵Dominik Schürmann2014-10-304-102/+28
|\| | | | | | | development
| * Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
| | | | | | | | Closes #981
| * 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 ↵Dominik Schürmann2014-10-268-5/+31
|\ | | | | | | development
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-263-0/+7
| | | | | | | | Closes #978
| * 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 ↵Vincent Breitmoser2014-10-261-2/+2
| |\ | | | | | | | | | development
| * | 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 ↵Vincent Breitmoser2014-10-263-81/+32
|\ | | | | | | development
| * 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
| |
* | add descriptive text to safeslinger activityVincent Breitmoser2014-10-263-16/+36
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-267-17/+57
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-261-10/+10
| |\ | | | | | | | | | development
| * | implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-267-17/+57
| | |
* | | Move advanced info into own activityDominik Schürmann2014-10-2612-343/+330
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-263-4/+18
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-267-19/+42
| |\ | | | | | | | | | development
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-263-4/+18
| | | | | | | | | | | | Fixes #974
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-262-8/+15
| |
* | Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-264-3/+19
| |
* | Fix layout of select key adapterDominik Schürmann2014-10-262-8/+8
|/
* Remove empty layoutDominik Schürmann2014-10-253-73/+1
|
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:03:33 +0000