aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-1479-2842/+1550
|\
| * Dont write version header by defaultDominik Schürmann2014-08-147-15/+15
| * Add user info dialogDominik Schürmann2014-08-131-0/+8
| * Move certify action down into actions sectionDominik Schürmann2014-08-131-12/+12
| * API: User interaction when account keys are deletedDominik Schürmann2014-08-132-2/+3
| * passphrase instead of pass phraseDominik Schürmann2014-08-071-2/+2
| * Pull from transifexDominik Schürmann2014-08-0775-2811/+1509
| * Readd missing stringDominik Schürmann2014-08-071-0/+1
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-06111-2083/+1754
|\|
| * ModernPGP infosDominik Schürmann2014-08-061-1/+1
| * Update changelog and aboutDominik Schürmann2014-08-062-89/+104
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-1/+1
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
| * Edit key: key flagsDominik Schürmann2014-08-051-1/+1
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-051-1/+1
| * More work on add subkey dialog designDominik Schürmann2014-08-052-4/+9
| * Work on add subkey dialog designDominik Schürmann2014-08-052-73/+88
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+5
| * Refactor expiry dialogDominik Schürmann2014-08-052-1/+17
| * KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
| * Pull from transifexDominik Schürmann2014-08-0443-1143/+1131
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-0431-79/+3
| * Even more smaller nitpicksDominik Schürmann2014-08-041-0/+1
| * Fix debug backup/restore methodsDominik Schürmann2014-08-041-1/+0
| * Remove old edit key stuffDominik Schürmann2014-08-043-309/+0
| * Edit key: subkey adding, not finishedDominik Schürmann2014-08-046-236/+136
| * button language in encryptDominik Schürmann2014-08-041-2/+1
| * Smaller UI fixesDominik Schürmann2014-08-043-30/+31
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0426-255/+367
| |\
| | * Minor cleanupmar-v-in2014-08-022-1/+2
| | * Fix focusing with To fieldmar-v-in2014-08-021-0/+2
| | * Encrypt UI (drop downs)mar-v-in2014-08-012-14/+35
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| | |\
| | * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-0110-51/+99
| | |\ \
| | * | | Fix string resourcesmar-v-in2014-07-312-5/+6
| | * | | Fix mergemar-v-in2014-07-311-0/+2
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-31136-672/+1008
| | |\ \ \
| | * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-314-30/+27
| | * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-203-13/+43
| | * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0636-483/+1601
| | |\ \ \ \
| | * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0624-237/+261
| | * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-024-79/+110
| | * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0163-115/+578
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-243-10/+83
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-225-38/+73
| | |\ \ \ \ \ \ \
| | * | | | | | | | Improve file more, Part 1mar-v-in2014-06-221-0/+1
* | | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-017-70/+64
|\| | | | | | | | |
| * | | | | | | | | Add user id with dialogDominik Schürmann2014-08-017-70/+64
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-01133-546/+975
|\| | | | | | | |
| * | | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 08:57:01 +0000