aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| * Pull from transifexDominik Schürmann2014-08-0443-1143/+1131
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-0437-92/+18
| * More cleanupDominik Schürmann2014-08-041-3/+4
| * Even more smaller nitpicksDominik Schürmann2014-08-042-12/+24
| * Remove support for IO_FILE, this is no longer used and was never a good pract...Dominik Schürmann2014-08-041-29/+2
| * Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-047-25/+98
| * Fix debug backup/restore methodsDominik Schürmann2014-08-044-30/+24
| * Remove old edit key stuffDominik Schürmann2014-08-046-1375/+0
| * 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-0451-1349/+2048
| |\
| | * 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-31211-3352/+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-0670-1927/+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-01112-620/+2177
| | |\ \ \ \ \
| | * \ \ \ \ \ 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-2242-495/+982
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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' into yubikeyDominik Schürmann2014-08-0122-336/+647
|\| | | | | | | | |
| * | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-01191-2525/+3325
|\| | | | | | | |
| * | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-13 02:03:32 +0000