Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fix keys with no expiry in ui code | Vincent Breitmoser | 2014-08-14 | 1 | -2/+7 | |
| * | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -4/+33 | |
| * | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+22 | |
| * | 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 | |
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 | |
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 2 | -55/+144 | |
|\| | ||||||
| * | 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 | 2 | -49/+72 | |
| * | 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 | |
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 7 | -81/+200 | |
|\| | ||||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 5 | -10/+10 | |
| * | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 1 | -0/+1 | |
| * | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -5/+67 | |
| * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -2/+2 | |
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 3 | -0/+51 | |
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 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 | 6 | -124/+414 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 5 | -48/+82 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 | |
| | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 2 | -13/+107 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 1 | -14/+14 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -5/+16 | |
* | | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -3/+7 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -3/+7 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 5 | -132/+260 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
| * | | | | | | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| * | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 | |
| * | | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 | |
| * | | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 3 | -12/+11 | |
| * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 | |
| * | | | | | | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+9 | |
| |/ / / / / / | ||||||
| * | | | | | | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 | |
| * | | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -42/+158 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 3 | -26/+69 | |
| | * | | | | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 3 | -20/+33 |