Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 4 | -6/+33 |
| | |||||
* | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 |
| | |||||
* | tests: be less verbose about inserting keyrings for encrypt/decrypt | Vincent Breitmoser | 2015-01-01 | 1 | -2/+15 |
| | |||||
* | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 3 | -45/+125 |
| | | | | cache | ||||
* | fix unit tests (canonicalize after create) | Vincent Breitmoser | 2015-01-01 | 2 | -0/+5 |
| | |||||
* | 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 | 25 | -62/+129 |
|\ | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 10 | -81/+189 |
| |\ | | | | | | | | | | development | ||||
| * | | 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 | 4 | -0/+5 |
| | | | |||||
* | | | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 2 | -10/+10 |
| | | | |||||
* | | | add test case for PIN unlock | Vincent Breitmoser | 2014-12-30 | 1 | -2/+28 |
| | | | |||||
* | | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 8 | -5/+38 |
| | | | |||||
* | | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 6 | -16/+24 |
| | | | |||||
* | | | Revert "Remove restriction for max parallel forks for gradle tests" | Vincent Breitmoser | 2014-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit ce34192dbbff388c0ccd384fba15cd95075a14ca. Conflicts: build.gradle | ||||
* | | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 13 | -24/+126 |
| |/ |/| | | | | | notation packet | ||||
* | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 10 | -81/+189 |
|/ | | | | capabilities | ||||
* | Cleanup UncachedKeyringTest | Dominik Schürmann | 2014-12-29 | 2 | -7/+7 |
| | |||||
* | Remove restriction for max parallel forks for gradle tests | Dominik Schürmann | 2014-12-28 | 1 | -6/+0 |
| | |||||
* | Remove necessity to prepare tests via shell script | Dominik Schürmann | 2014-12-28 | 3 | -35/+3 |
| | |||||
* | Fix test for future creation timestamps to account for loosen timestamp check | Dominik Schürmann | 2014-12-28 | 2 | -5/+7 |
| | |||||
* | 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 |
| | |||||
* | New icon for Lollipop release | Dominik Schürmann | 2014-12-14 | 30 | -0/+1989 |
| | |||||
* | Update plugin to 1.0 | Dominik Schürmann | 2014-12-12 | 3 | -1/+1 |
| | |||||
* | Merge branch 'master' into development | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 |
|\ | |||||
| * | Add passhrase attacking screens for wiki | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 |
| | | |||||
* | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | | |||||
* | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | | |||||
* | | Fix travis | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | | |||||
* | | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 4 | -8/+6 |
| | | |||||
* | | Switch from mavenCentral to jcenter | Dominik Schürmann | 2014-12-04 | 1 | -2/+2 |
| | | |||||
* | | Fix jacoco | Dominik Schürmann | 2014-12-04 | 1 | -24/+23 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
|\ \ | | | | | | | | | | development | ||||
| * \ | Merge pull request #1011 from cketti/fix_k9_references | Dominik Schürmann | 2014-11-27 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Fix spelling of 'K-9 Mail' in FAQ | ||||
| | * | | 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 | 15 | -43/+42 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version ↵ | Dominik Schürmann | 2014-12-04 | 2 | -36/+35 |
| | | | | | | | | | | | | anymore, jacoco disabled for now | ||||
| * | | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 |
| | | | |||||
| * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 |
| | | | |||||
| * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 3 | -4/+4 |
| |/ | |||||
* | | 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 | 7 | -12/+11 |
| | | |||||
* | | Update keybase and minidns libs | Dominik Schürmann | 2014-11-04 | 2 | -0/+0 |
|/ | |||||
* | 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 | 32 | -116/+490 |
| |\ | | | | | | | | | | development |