aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| * 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
* | 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
|\|
| * cleanupDominik Schürmann2014-07-081-30/+0
| * Work on subkeys adapterDominik Schürmann2014-07-084-14/+64
* | 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
|/
* 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
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-5/+3
| * | Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-297-10/+45
| * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-291-6/+3
| * | Improved button styleDaniel Albert2014-06-293-21/+12
| * | Added button_rounded styleDaniel Albert2014-06-282-3/+49
* | | work on edit keyDominik Schürmann2014-06-303-6/+2
| |/ |/|
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-0/+6
* | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-10/+23
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-287-0/+316
|\ \ | |/ |/|
| * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-1/+1
| * More wizardryDominik Schürmann2014-06-272-15/+43
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-271-0/+8
| |\
| * | Start work on a first-time wizardDominik Schürmann2014-06-275-0/+218
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 02:21:34 +0000