aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* | | | | | | | Add user id with dialogDominik Schürmann2014-08-011-3/+3
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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
|\ \ \ \ \
| * | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-1/+1
| * | | | | Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-261-3/+39
| |\ \ \ \ \
| * | | | | | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-0/+1
| * | | | | | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Use icons in key viewDominik Schürmann2014-07-281-0/+4
* | | | | | Work on first time wizard designDominik Schürmann2014-07-271-0/+5
| |/ / / / |/| | | |
* | | | | test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+1
* | | | | canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+2
* | | | | Fixed another unescaped apostrophe.Daniel Albert2014-07-171-1/+1
* | | | | Fixed unescaped apostropheDaniel Albert2014-07-171-1/+1
* | | | | Added description to Setting, Changed title to suggested oneDaniel Albert2014-07-171-1/+2
* | | | | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-161-3/+22
|\ \ \ \ \
| * | | | | New first time screenDominik Schürmann2014-07-161-1/+6
| * | | | | merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-0/+1
| * | | | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-151-0/+7
| |\ \ \ \ \
| * | | | | | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-0/+5
| * | | | | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-0/+5
| |\ \ \ \ \ \
| * | | | | | | get rid of some inspection warningsVincent Breitmoser2014-07-111-1/+1
| * | | | | | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+1
| * | | | | | | add come createKey stringsVincent Breitmoser2014-07-111-1/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-131-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 21:50:26 +0000