aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-3021-62/+124
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * | | | | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| | | | | |
| * | | | | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-308-5/+38
| | | | | |
| * | | | | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-301-0/+3
| | | | | |
| * | | | | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-3013-24/+126
| | | | | | | | | | | | | | | | | | | | | | | | notation packet
* | | | | | Passphrase wizard testsDominik Schürmann2015-01-0613-22/+1891
| |/ / / / |/| | | |
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-295-65/+173
|\| | | | | | | | | | | | | | | | | | | development
| * | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-295-65/+173
| | | | | | | | | | | | | | | | | | | | capabilities
* | | | | New work on PIN and lock pattern UIDominik Schürmann2014-12-2921-61/+126
|/ / / /
* | | | Allow for creation date to be in the future up to one day to account for ↵Dominik Schürmann2014-12-281-4/+9
| | | | | | | | | | | | | | | | diverging clocks on different systems for fresh keys
* | | | Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
| |_|/ |/| |
* | | Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-043-3/+1
| | |
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-041-3/+3
|\ \ \ | | | | | | | | | | | | development
| * | | Fix spelling of 'K-9 Mail' in FAQcketti2014-11-261-3/+3
| | |/ | |/|
* | | Merge branch 'master' into developmentDominik Schürmann2014-12-041-3/+3
|\ \ \ | |/ / |/| |
| * | Set version to 3.2beta1Dominik Schürmann2014-12-041-3/+3
| |/
* | 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
|/
* 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 ↵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
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-15 17:23:35 +0000