aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2611-227/+183
|\
| * 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-172-3/+5
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-168-212/+130
| |\
| | * Simple create keyDominik Schürmann2014-07-161-5/+0
| | * New first time screenDominik Schürmann2014-07-168-205/+114
| | * 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-113-14/+34
| | |\ \
| | * | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| * | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-122-0/+6
| |/ / /
| * | | Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| * | | Fixed issues discussed in #713Daniel Albert2014-07-121-2/+3
| * | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-0/+6
| | |/ | |/|
| * | cleanupDominik Schürmann2014-07-081-30/+0
| * | Work on subkeys adapterDominik Schürmann2014-07-084-14/+64
| |/
* | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-073-1/+7
* | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+1
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
* Use strings in edit keyDominik Schürmann2014-07-032-4/+14
* Pull from transifexDominik Schürmann2014-07-033-7/+30
* Pull from transifexDominik Schürmann2014-07-0325-352/+1289
* Small strings fixDominik Schürmann2014-07-031-1/+1
* Remove old edit button, rename activitiesDominik Schürmann2014-07-031-16/+0
* Cache passphrase for editDominik Schürmann2014-07-032-7/+92
* edit key: subkey adapterDominik Schürmann2014-07-032-1/+97
* Work on editDominik Schürmann2014-07-033-12/+3
* A little bit less purpleDominik Schürmann2014-07-022-7/+4
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-025-83/+72
|\
| * edit key: work on savingDominik Schürmann2014-07-021-8/+0
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-021-1/+1
| |\
| * | Edit key: adding user idsDominik Schürmann2014-07-024-15/+72
| * | edit key: part 3Dominik Schürmann2014-07-011-60/+0
* | | Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+4
|\ \ \ | |_|/ |/| |
| * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-0/+2
* | | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3042-90/+216
|\ \
| * | (should have) fixed Travis buildsDaniel Albert2014-06-302-7/+2
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-308-10/+345
| |\|
| * | Converted all other buttonsDaniel Albert2014-06-3018-30/+28
| * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-2913-24/+90
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:38:49 +0000