Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 1 | -2/+12 |
|\ | |||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| * | Add user info dialog | Dominik Schürmann | 2014-08-13 | 1 | -0/+8 |
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 1 | -0/+1 |
| * | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 |
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -83/+22 |
|\| | |||||
| * | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ... | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 1 | -0/+5 |
| * | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -75/+0 |
| * | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -0/+1 |
| * | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -2/+1 |
| * | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -2/+3 |
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -2/+10 |
| |\ | |||||
| | * | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -0/+1 |
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -1/+1 |
| | |\ | |||||
| | * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -18/+18 |
| | |\ \ | |||||
| | * | | | Fix string resources | mar-v-in | 2014-07-31 | 1 | -4/+5 |
| | * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -15/+88 |
| | |\ \ \ | |||||
| | * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -0/+2 |
| | * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -7/+20 |
| | |\ \ \ \ | |||||
| | * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 1 | -0/+1 |
| | * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -0/+2 |
| | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -12/+26 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 1 | -8/+0 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -3/+3 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 2 | -29/+67 |
|\| | | | | | | | |||||
| * | | | | | | | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -0/+1 |
| * | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| * | | | | | | Remove private/secret key language from strings | Dominik Schürmann | 2014-07-31 | 1 | -9/+5 |
| * | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -0/+1 |
| * | | | | | | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -7/+9 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 1 | -0/+2 |
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 1 | -0/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 1 | -0/+14 |
| * | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+10 |
| |/ / / / / | |||||
| * | | | | | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -5/+7 |
| * | | | | | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | | | | | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| * | | | | | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
| * | | | | | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 1 | -2/+3 |
| * | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 2 | -1/+3 |
| |\ \ \ \ \ |