aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
| * 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-31205-3178/+4239
| |\ \ \
| * | | | - 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-0669-1926/+3537
| |\ \ \ \
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0635-345/+897
| * | | | | 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-01110-619/+2110
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-2415-79/+576
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2236-483/+873
| |\ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-318-53/+92
|\ \ \ \ \ \ \
| * | | | | | | lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
| * | | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-317-51/+90
* | | | | | | | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
|/ / / / / / /
* | | | | | | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
* | | | | | | Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
* | | | | | | Fixes for uploadDominik Schürmann2014-07-314-15/+20
* | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-315-46/+43
|\ \ \ \ \ \ \
| * | | | | | | fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-313-25/+21
| * | | | | | | more fixes on canonicalization and progressVincent Breitmoser2014-07-312-21/+22
| |/ / / / / /