aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-3/+4
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-1/+19
|\
| * 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, more...Vincent Breitmoser2014-06-161-9/+17
* | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1819-136/+210
|/
* Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
* Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-137-2/+28
|\
| * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-061-0/+39
| |\
| * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-064-0/+19
| |\ \
| | * | Fixing TAG and string resourcemar-v-in2014-06-061-2/+1
| | * | Show keys with android contactsmar-v-in2014-06-052-3/+2
| | * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0493-649/+1315
| | |\ \
| | * | | First version of automatic contact discovery.mar-v-in2014-06-044-0/+21
| * | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-062-2/+2
| * | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-062-0/+7
| | |/ / | |/| |
* | | | 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-102-3/+11
* | | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1011-70/+72
* | | | import-log: more interface workVincent Breitmoser2014-06-101-10/+23
* | | | import-log: some cosmeticsVincent Breitmoser2014-06-105-23/+26
* | | | import-log: add LogDisplay activityVincent Breitmoser2014-06-104-17/+91
* | | | 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
|/ /
* | Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0293-652/+1317
|\ \
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-311-3/+3
| |\|
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-3/+3
| * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| |/
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2110-67/+59
|\|
| * Layout fixes for key importDominik Schürmann2014-05-199-66/+58
| * Clarify help startDominik Schürmann2014-05-141-1/+1
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-14366-941/+2107
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 19:21:43 +0000