Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 4 | -30/+24 | |
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 6 | -1375/+0 | |
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 14 | -561/+259 | |
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 2 | -3/+1 | |
* | 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 | 7 | -56/+59 | |
|/ | ||||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 51 | -1349/+2048 | |
|\ | ||||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 4 | -3/+3 | |
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 3 | -3/+20 | |
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 6 | -35/+75 | |
| * | 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 | 2 | -9/+15 | |
| |\ | ||||||
| * | | 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 | 25 | -206/+299 | |
| |\ \ | ||||||
| * | | | Fix string resources | mar-v-in | 2014-07-31 | 3 | -6/+7 | |
| * | | | Fix merge | mar-v-in | 2014-07-31 | 4 | -37/+21 | |
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 211 | -3352/+4239 | |
| |\ \ \ | ||||||
| * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 15 | -126/+136 | |
| * | | | | 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 | 11 | -578/+597 | |
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 70 | -1927/+3537 | |
| |\ \ \ \ | ||||||
| * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 35 | -345/+897 | |
| * | | | | | 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 | 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 | 112 | -620/+2177 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 15 | -79/+576 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 42 | -495/+982 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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' 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 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 |