Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 12 | -152/+216 | |
| | * | | | | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 5 | -0/+201 | |
| | * | | | | | Missing import after merge | mar-v-in | 2014-07-01 | 1 | -0/+1 | |
| | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 113 | -621/+2177 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 16 | -81/+582 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 43 | -524/+991 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 15 | -496/+291 | |
| * | | | | | | | | | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 22 | -336/+647 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 7 | -108/+192 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 | |
| | * | | | | | | | | | remove debug output about security providers (cleaner unit tests) | Vincent Breitmoser | 2014-08-01 | 1 | -0/+2 | |
| | * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 3 | -31/+35 | |
| | * | | | | | | | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 2 | -97/+179 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * / | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 15 | -228/+455 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 192 | -2526/+3325 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 | |
| * | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 3 | -15/+72 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | 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 CachedPublicKeyring | mar-v-in | 2014-08-01 | 2 | -12/+58 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * / | | | | | | | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 3 | -23/+26 | |
| * | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 2 | -7/+7 | |
| * | | | | | | | Remove runtime check to fix passphrase service | Dominik Schürmann | 2014-08-01 | 1 | -6/+0 | |
| * | | | | | | | Use darker colors | Dominik Schürmann | 2014-08-01 | 3 | -9/+9 | |
| * | | | | | | | Show file tab only for import of existing keys | Dominik Schürmann | 2014-08-01 | 1 | -15/+42 | |
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 8 | -53/+92 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | lowercase all key ids from keyserver | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | * | | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 7 | -51/+90 | |
| * | | | | | | | | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 | |
| * | | | | | | | 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 | 4 | -15/+20 | |
| * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 5 | -46/+43 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 3 | -25/+21 | |
| | * | | | | | | | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 2 | -21/+22 | |
| | |/ / / / / / | ||||||
| * / / / / / / | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 9 | -23/+52 | |
| |/ / / / / / | ||||||
| * | | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 5 | -47/+31 | |
| * | | | | | | Add notify layouts to some activities | Dominik Schürmann | 2014-07-31 | 4 | -80/+104 | |
| * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 4 | -19/+99 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 4 | -19/+99 | |
| * | | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 15 | -36/+52 | |
| |/ / / / / / | ||||||
| * | | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ... | Dominik Schürmann | 2014-07-31 | 3 | -16/+128 | |
| * | | | | | | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| * | | | | | | fix fromStream method, properly recognize multiple concatenated streams | Vincent Breitmoser | 2014-07-31 | 1 | -17/+20 | |
| * | | | | | | always return an EditKeyResult in modifyKey method | Vincent Breitmoser | 2014-07-31 | 1 | -25/+25 | |
| * | | | | | | Handle result in create key | Dominik Schürmann | 2014-07-31 | 1 | -2/+7 | |
| * | | | | | | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |