Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -7/+13 | |
| | | | | | | | | closes #1012 | |||||
| * | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 12 | -71/+123 | |
| | | ||||||
| * | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 3 | -1/+10 | |
| | | ||||||
| * | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 | |
| | | ||||||
| * | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 2 | -2/+2 | |
| | | | | | | | | cache | |||||
| * | fix small merge conflict oversight | Vincent Breitmoser | 2014-12-30 | 1 | -3/+0 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 22 | -62/+125 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 2 | -10/+10 | |
| | | | ||||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 8 | -5/+38 | |
| | | | ||||||
| * | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 1 | -0/+3 | |
| | | | ||||||
| * | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 13 | -24/+126 | |
| | | | | | | | | | | | | notation packet | |||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 13 | -22/+1891 | |
| |/ |/| | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 5 | -65/+173 | |
|\| | | | | | | | development | |||||
| * | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 5 | -65/+173 | |
| | | | | | | | | capabilities | |||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 21 | -61/+126 | |
| | | ||||||
* | | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+1 | |
|/ | ||||||
* | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 | |
| | | | | diverging clocks on different systems for fresh keys | |||||
* | Fix crash on first time wizard | Dominik Schürmann | 2014-12-28 | 1 | -2/+2 | |
| | ||||||
* | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 4 | -8/+6 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
|\ | | | | | | | development | |||||
| * | Fix spelling of 'K-9 Mail' in FAQ | cketti | 2014-11-26 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'master' into development | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
|\ \ | |/ |/| | ||||||
| * | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
| | | ||||||
* | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 | |
| | | ||||||
* | | NFC activity design | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 | |
| | | ||||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 4 | -11/+11 | |
|/ | ||||||
* | Version 3.1.2 | Dominik Schürmann | 2014-11-02 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-11-02 | 23 | -17/+182 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-11-02 | 1 | -18/+39 | |
|\ | | | | | | | development | |||||
| * | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 31 | -116/+486 | |
| |\ | | | | | | | | | | development | |||||
| * | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 | |
| | | | ||||||
* | | | Changelog | Dominik Schürmann | 2014-11-02 | 1 | -0/+5 | |
| |/ |/| | ||||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Revert "Version 3.1.1" | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167. | |||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Pull from transifex | Dominik Schürmann | 2014-10-30 | 27 | -101/+467 | |
| | | ||||||
* | | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 2 | -1/+7 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 | |
|\| | | | | | | | development | |||||
| * | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 | |
| | | | | | | | | Closes #981 | |||||
| * | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 | |
| | | ||||||
| * | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 | |
| | | ||||||
| * | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 | |
| | | ||||||
* | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 | |
|/ | ||||||
* | Version 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 20 | -0/+220 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 56 | -878/+3333 | |
| | ||||||
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -0/+12 | |
| | ||||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 | |
| | ||||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 12 | -322/+103 | |
| |