aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-0685-3041/+2839
|\
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-057-31/+31
| * Optimize importsDominik Schürmann2014-08-0541-66/+64
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
| * Edit key: key flagsDominik Schürmann2014-08-055-16/+27
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-059-77/+101
| * More work on add subkey dialog designDominik Schürmann2014-08-051-3/+6
| * Work on add subkey dialog designDominik Schürmann2014-08-053-13/+39
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-053-19/+70
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-053-6/+7
| * Refactor expiry dialogDominik Schürmann2014-08-055-226/+291
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-052-3/+7
| |\
| | * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-042-3/+7
| * | KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-059-34/+55
| |/
| * Add license headersDominik Schürmann2014-08-0419-0/+323
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-046-13/+15
| * More cleanupDominik Schürmann2014-08-041-3/+4
| * Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
| * 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-042-28/+23
| * Remove old edit key stuffDominik Schürmann2014-08-043-1066/+0
| * Edit key: subkey adding, not finishedDominik Schürmann2014-08-048-325/+123
| * button language in encryptDominik Schürmann2014-08-041-1/+0
| * 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-043-1/+10
| |/
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0424-1091/+1668
| |\
| | * Minor cleanupmar-v-in2014-08-022-2/+1
| | * Fix focusing with To fieldmar-v-in2014-08-022-3/+18
| | * Encrypt UI (drop downs)mar-v-in2014-08-014-21/+40
| | * 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-011-8/+14
| | |\
| | * | Fixes after mergemar-v-in2014-08-011-2/+5
| | * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0115-155/+200
| | |\ \
| | * | | Fix string resourcesmar-v-in2014-07-311-1/+1
| | * | | Fix mergemar-v-in2014-07-313-37/+19
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-3168-2479/+3045
| | |\ \ \
| | * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-3110-94/+106
| | * | | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| | * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-208-565/+554
| | * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0632-1441/+1934
| | |\ \ \ \
| | * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0610-108/+635
| | * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-028-73/+106
| | * | | | | Add temporary file storage as discussed in #665mar-v-in2014-07-014-0/+192
| | * | | | | Missing import after mergemar-v-in2014-07-011-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 07:01:13 +0000