aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-141-2/+12
|\
| * Dont write version header by defaultDominik Schürmann2014-08-141-2/+2
| * Add user info dialogDominik Schürmann2014-08-131-0/+8
| * API: User interaction when account keys are deletedDominik Schürmann2014-08-131-0/+1
| * Readd missing stringDominik Schürmann2014-08-071-0/+1
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-83/+22
|\|
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-1/+1
| * Increase maximum custom RSA sizeDominik 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-051-1/+1
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+5
| * Refactor expiry dialogDominik Schürmann2014-08-051-1/+1
| * KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-75/+0
| * Even more smaller nitpicksDominik Schürmann2014-08-041-0/+1
| * button language in encryptDominik Schürmann2014-08-041-2/+1
| * Smaller UI fixesDominik Schürmann2014-08-041-2/+3
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-2/+10
| |\
| | * Minor cleanupmar-v-in2014-08-021-0/+1
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| | |\
| | * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-18/+18
| | |\ \
| | * | | Fix string resourcesmar-v-in2014-07-311-4/+5
| | * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-312-15/+88
| | |\ \ \
| | * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| | * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-7/+20
| | |\ \ \ \
| | * | | | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| | * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-021-0/+2
| | * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-12/+26
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-221-8/+0
| | |\ \ \ \ \ \
| | * | | | | | | Improve file more, Part 1mar-v-in2014-06-221-0/+1
* | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-3/+3
|\| | | | | | | |
| * | | | | | | | Add user id with dialogDominik Schürmann2014-08-011-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-012-29/+67
|\| | | | | | |
| * | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Certifying instead of signingDominik Schürmann2014-08-011-0/+1
| * | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-311-2/+2
| * | | | | | Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
| * | | | | | Fixes for uploadDominik Schürmann2014-07-311-0/+1
| * | | | | | Create key: design fixesDominik Schürmann2014-07-311-7/+9
| | |_|_|_|/ | |/| | | |
| * | | | | Fix animations in create keyDominik Schürmann2014-07-311-0/+2
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-311-0/+14
| |\ \ \ \ \
| | * | | | | completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-0/+14
| * | | | | | Robots like coffee too...Dominik Schürmann2014-07-311-4/+10
| |/ / / / /
| * | | | | Fix stringDominik Schürmann2014-07-311-1/+1
| * | | | | Keyserver exception translateableDominik Schürmann2014-07-311-5/+7
| * | | | | Exception handling with keyserver queriesDominik Schürmann2014-07-311-1/+1
| * | | | | Better exception handling for import of keysDominik Schürmann2014-07-311-1/+1
| * | | | | couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
| * | | | | Create key: repeat passphraseDominik Schürmann2014-07-301-2/+3
| * | | | | Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-292-1/+3
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-25 05:07:28 +0000