Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 2 | -28/+23 | |
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -1066/+0 | |
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 8 | -325/+123 | |
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-04 | 1 | -102/+0 | |
|\ | ||||||
| * | delete unused PgpConversionHelper | Vincent Breitmoser | 2014-08-04 | 1 | -102/+0 | |
* | | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -1/+10 | |
|/ | ||||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 24 | -1091/+1668 | |
|\ | ||||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -2/+1 | |
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 2 | -3/+18 | |
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 4 | -21/+40 | |
| * | Cache input file thumbnail. | mar-v-in | 2014-08-01 | 1 | -3/+20 | |
| * | Cache contact photos to make UI more fluid | mar-v-in | 2014-08-01 | 1 | -0/+10 | |
| * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 | |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -8/+14 | |
| |\ | ||||||
| * | | Fixes after merge | mar-v-in | 2014-08-01 | 1 | -2/+5 | |
| * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 15 | -155/+200 | |
| |\ \ | ||||||
| * | | | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 | |
| * | | | Fix merge | mar-v-in | 2014-07-31 | 3 | -37/+19 | |
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 68 | -2479/+3045 | |
| |\ \ \ | ||||||
| * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 10 | -94/+106 | |
| * | | | | Make DecryptFragment abstract, as it should be | mar-v-in | 2014-07-25 | 1 | -4/+2 | |
| * | | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 8 | -565/+554 | |
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 32 | -1441/+1934 | |
| |\ \ \ \ | ||||||
| * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 10 | -108/+635 | |
| * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 | |
| * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 8 | -73/+106 | |
| * | | | | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 4 | -0/+192 | |
| * | | | | | 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 | 44 | -504/+1494 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 12 | -69/+493 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 30 | -445/+795 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 14 | -496/+290 | |
* | | | | | | | | | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 | |
* | | | | | | | | | 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 | 8 | -158/+391 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 CachedPublicKeyring | mar-v-in | 2014-08-01 | 2 | -12/+58 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 2 | -22/+26 | |
* | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 | |
* | | | | | | | 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 |