aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-0/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
| * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-061-0/+39
| |\ | | | | | | Parcelable operation result with logging capabilities + import logging
| * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-061-0/+2
| |\ \ | | | | | | | | Automatic contact discovery and more
| | * | Fixing TAG and string resourcemar-v-in2014-06-061-2/+1
| | | |
| | * | Show keys with android contactsmar-v-in2014-06-051-0/+1
| | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
| | * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * | | First version of automatic contact discovery.mar-v-in2014-06-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
| * | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-061-0/+1
| | |/ / | |/| |
* | | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-121-2/+5
| | | |
* | | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
| | | |
* | | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-6/+13
| | | |
* | | | import-log: more minor improvementsVincent Breitmoser2014-06-121-8/+6
| | | |
* | | | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-121-1/+1
| | | |
* | | | import-log: minor improvementsVincent Breitmoser2014-06-121-1/+3
| | | |
* | | | canonicalize: more stuffVincent Breitmoser2014-06-121-7/+10
| | | |
* | | | canonicalize: implementation, first draftVincent Breitmoser2014-06-121-1/+20
| | | |
* | | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-1/+0
| | | |
* | | | import-log: work on log fragment uiVincent Breitmoser2014-06-101-2/+2
| | | |
* | | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-20/+22
| | | |
* | | | import-log: more interface workVincent Breitmoser2014-06-101-10/+23
| | | |
* | | | import-log: some cosmeticsVincent Breitmoser2014-06-101-23/+26
| | | |
* | | | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-3/+9
| |_|/ |/| |
* | | import-log: better stripped key loggingVincent Breitmoser2014-06-061-1/+2
| | |
* | | import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:58:22 +0000