| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -7/+25 |
| * | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -2/+19 |
| * | Change account type | Dominik Schürmann | 2014-08-21 | 1 | -3/+3 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 1 | -0/+8 |
| |\ |
|
| | * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 1 | -0/+8 |
| * | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| |/ |
|
| * | 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 | Dominik Schürmann | 2014-08-20 | 1 | -3/+10 |
| |\ |
|
| | * | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -3/+10 |
| * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -2/+0 |
| |/ |
|
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -10/+3 |
| * | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+15 |
| * | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+1 |
| * | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -1/+6 |
| * | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 1 | -15/+19 |
| * | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+22 |
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -6/+14 |
| * | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -1/+1 |
| * | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -8/+73 |
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -4/+1 |
| * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -2/+2 |
| * | Remove support for IO_FILE, this is no longer used and was never a good pract... | Dominik Schürmann | 2014-08-04 | 1 | -29/+2 |
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -40/+72 |
| |\ |
|
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -8/+14 |
| | |\ |
|
| | * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -0/+5 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -40/+44 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -16/+29 |
| | |\ \ \ \ |
|
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| | * | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -5/+16 |
| * | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -3/+7 |
| | |_|_|_|/
|/| | | | |
|
| * | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 |
| * | | | | | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 |
| |\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| | * | | | | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 |
| | * | | | | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 |
| | | |_|/
| |/| | |
|
| * / | | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 |
| |/ / / |
|
| * | | | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| * | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ... | Dominik Schürmann | 2014-07-31 | 1 | -7/+6 |
| * | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -9/+9 |
| * | | | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 |
| * | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -22/+28 |
| * | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -1/+2 |
| * | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 |
| * | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 |
| * | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -1/+2 |
| |\ \ \ |
|
| | * | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 1 | -1/+2 |
| | | |/
| |/| |
|
| * / | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 |
| |/ / |
|
