aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-0414-561/+259
* button language in encryptDominik Schürmann2014-08-042-3/+1
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-041-102/+0
|\
| * delete unused PgpConversionHelperVincent Breitmoser2014-08-041-102/+0
* | Smaller UI fixesDominik Schürmann2014-08-047-56/+59
|/
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0452-1349/+2049
|\
| * Minor cleanupmar-v-in2014-08-024-3/+3
| * Fix focusing with To fieldmar-v-in2014-08-023-3/+20
| * Encrypt UI (drop downs)mar-v-in2014-08-016-35/+75
| * Cache input file thumbnail.mar-v-in2014-08-011-3/+20
| * Cache contact photos to make UI more fluidmar-v-in2014-08-011-0/+10
| * Fix first key is not used erroneouslymar-v-in2014-08-011-1/+0
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-012-9/+15
| |\
| * | Fixes after mergemar-v-in2014-08-011-2/+5
| * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0125-206/+299
| |\ \
| * | | Fix string resourcesmar-v-in2014-07-313-6/+7
| * | | Fix mergemar-v-in2014-07-314-37/+21
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-31212-3361/+4240
| |\ \ \
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-3115-126/+136
| * | | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-2011-578/+597
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0670-1927/+3537
| |\ \ \ \
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0636-346/+898
| * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-0212-152/+216
| * | | | | Add temporary file storage as discussed in #665mar-v-in2014-07-015-0/+201
| * | | | | Missing import after mergemar-v-in2014-07-011-0/+1
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-01113-621/+2177
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-2416-81/+582
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2243-524/+991
| |\ \ \ \ \ \ \
| * | | | | | | | Improve file more, Part 1mar-v-in2014-06-2215-496/+291
* | | | | | | | | small fix for MSG_MF_UID_ADD log entryVincent Breitmoser2014-08-011-1/+1
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-017-108/+192
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-012-6/+2
| * | | | | | | | | remove debug output about security providers (cleaner unit tests)Vincent Breitmoser2014-08-011-0/+2
| * | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-013-31/+35
| * | | | | | | | | move classes around a bitVincent Breitmoser2014-08-012-97/+179
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Add user id with dialogDominik Schürmann2014-08-0115-228/+455
|/ / / / / / / /
* | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-013-15/+72
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Undo import changesmar-v-in2014-08-011-3/+27
| | * | | | | | | | Fix import from servermar-v-in2014-08-011-30/+17
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fix CachedPublicKeyringmar-v-in2014-08-012-12/+58
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
|/ / / / / / /
* | | | | | | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-013-23/+26
* | | | | | | Certifying instead of signingDominik Schürmann2014-08-012-7/+7
* | | | | | | Remove runtime check to fix passphrase serviceDominik Schürmann2014-08-011-6/+0
* | | | | | | Use darker colorsDominik Schürmann2014-08-013-9/+9
* | | | | | | Show file tab only for import of existing keysDominik Schürmann2014-08-011-15/+42