| Commit message (Expand) | Author | Age | Files | Lines |
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -0/+2 |
* | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -12/+13 |
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -3/+7 |
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+4 |
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 1 | -1/+6 |
|\ |
|
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -1/+6 |
* | | 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 |
|/ |
|
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
* | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -5/+2 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -1/+3 |
|\ |
|
| * | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
* | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
|/ |
|
* | 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 | 1 | -0/+1 |
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+9 |
* | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -0/+4 |
* | 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 |
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+1 |
* | Add license headers | Dominik Schürmann | 2014-08-04 | 1 | -0/+17 |
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 |
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -1/+0 |
* | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
* | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -3/+28 |
* | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -8/+0 |
* | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 1 | -9/+51 |
|\ |
|
| * | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
| * | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |
| * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| * | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
| * | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -8/+8 |
| |\ |
|
| | * | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
| * | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -4/+0 |
| * | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| * | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+5 |
| * | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads... | Vincent Breitmoser | 2014-07-09 | 1 | -0/+1 |
| |\ \ |
|
| | * | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| | |/ |
|
| * | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 1 | -0/+10 |
| |\ \
| | |/
| |/| |
|
| | * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| * | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -5/+25 |
| |/ |
|
* / | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 1 | -0/+60 |
|/ |
|
* | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+7 |
|\ |
|