aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * 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
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| * | | 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-121-0/+1
|/ / /
* | | 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
| |/ |/|
* | Work on subkeys adapterDominik Schürmann2014-07-081-0/+5
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
|
* Use strings in edit keyDominik Schürmann2014-07-031-0/+10
|
* Small strings fixDominik Schürmann2014-07-031-1/+1
|
* Work on editDominik Schürmann2014-07-031-4/+3
|
* Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+4
|\
| * support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| | | | | | | | Closes #695
| * add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-0/+2
| |
* | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+1
|/ | | | closes #703
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-10/+23
| | | | closes #698
* Start work on a first-time wizardDominik Schürmann2014-06-271-0/+1
|
* Rename registered apps to appsDominik Schürmann2014-06-241-2/+2
|
* Revert hint_keybase_searchDominik Schürmann2014-06-221-1/+1
|
* Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-1/+1
|
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-8/+0
|
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-3/+4
|
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-1/+19
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| * new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-171-0/+19
| |
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-1/+2
| |
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
| |
* | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-3/+3
| |
* | consolidate: make it workVincent Breitmoser2014-06-181-6/+8
| |
* | consolidate: add loggingVincent Breitmoser2014-06-181-0/+7
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-10/+23
|\ \
| * | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
| | |
| * | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
| |/
| * drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
| |
| * import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-9/+17
| | | | | | | | more docs
* | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-181-14/+9
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 23:06:59 +0000