| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -0/+6 |
* | Yubikey: use PIN | Dominik Schürmann | 2014-09-08 | 1 | -0/+2 |
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -1/+2 |
* | Add experimental support for yubikey PINs, remove caching of empty passphrases | Dominik Schürmann | 2014-09-05 | 1 | -7/+5 |
* | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 1 | -23/+32 |
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -0/+2 |
* | remove broken(?) cancellation code | Vincent Breitmoser | 2014-09-01 | 1 | -29/+7 |
* | add cancel prevention mechanism, improve cancellation for key import | Vincent Breitmoser | 2014-08-31 | 2 | -3/+11 |
* | don't make our service sticky | Vincent Breitmoser | 2014-08-31 | 1 | -1/+1 |
* | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 2 | -19/+38 |
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 4 | -25/+49 |
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+4 |
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 6 | -96/+321 |
|\ |
|
| * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 2 | -6/+30 |
| |\ |
|
| | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 2 | -6/+30 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -3/+3 |
| |\ \ |
|
| | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -3/+3 |
| * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| |/ / |
|
| * / | Abort import of pubkeys where secret keys exist but new pubkey has more subke... | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| |/ |
|
| * | Change account type | Dominik Schürmann | 2014-08-21 | 2 | -5/+5 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 2 | -38/+62 |
| |\ |
|
| | * | Comment extra in requestSync | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 2 | -0/+21 |
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 2 | -3/+54 |
| | |\ |
|
| | * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | * | | Disable key import in sync adapter | Dominik Schürmann | 2014-08-20 | 1 | -38/+39 |
| * | | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 4 | -0/+4 |
| | |/
| |/| |
|
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -2/+3 |
| |\| |
|
| | * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -2/+3 |
| * | | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -1/+49 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -5/+2 |
| |\| |
|
| | * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -5/+2 |
| * | | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 1 | -2/+5 |
| |/ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -3/+3 |
| |\ |
|
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -3/+10 |
| | |\ |
|
| | * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 2 | -3/+3 |
| * | | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
| | |/
| |/| |
|
| * | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -3/+10 |
| |/ |
|
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -2/+2 |
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+20 |
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 2 | -10/+4 |
| * | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 3 | -0/+32 |
| * | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+1 |
| * | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -0/+4 |
| * | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -1/+6 |
| * | Fix and simplify in OperationResultParcel | Dominik Schürmann | 2014-08-16 | 1 | -11/+7 |
| * | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -2/+3 |
| * | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+12 |
| * | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 |
| * | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 |