| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -0/+2 |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -12/+26 |
| |\ |
|
| | * | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -10/+23 |
| | * | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 1 | -0/+1 |
| | * | Rename registered apps to apps | Dominik Schürmann | 2014-06-24 | 1 | -2/+2 |
| | * | Revert hint_keybase_search | Dominik Schürmann | 2014-06-22 | 1 | -1/+1 |
| | * | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -1/+1 |
| * | | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 1 | -8/+0 |
| |\| |
|
| | * | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -8/+0 |
| * | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -0/+1 |
| |/ |
|
| * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| * | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 1 | -1/+19 |
| |\ |
|
| | * | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -0/+19 |
| * | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -1/+2 |
| * | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| * | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -3/+3 |
| * | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+8 |
| * | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+7 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -10/+23 |
| |\ \ |
|
| | * | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -0/+1 |
| | * | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -1/+3 |
| | |/ |
|
| | * | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+2 |
| | * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more... | Vincent Breitmoser | 2014-06-16 | 1 | -9/+17 |
| * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -14/+9 |
| |/ |
|
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+3 |
| |\ |
|
| | * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 1 | -0/+39 |
| | |\ |
|
| | * \ | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 1 | -0/+2 |
| | |\ \ |
|
| | | * | | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 1 | -2/+1 |
| | | * | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+1 |
| | | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -0/+1 |
| | | |\ \ |
|
| | | * | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+2 |
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 1 | -0/+1 |
| | | |/ /
| |/| | |
|
| * | | | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -2/+5 |
| * | | | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 |
| * | | | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -6/+13 |
| * | | | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -8/+6 |
| * | | | | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| * | | | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -1/+3 |
| * | | | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
| * | | | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+20 |
| * | | | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -1/+0 |
| * | | | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -2/+2 |
| * | | | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -20/+22 |
| * | | | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -10/+23 |
| * | | | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 1 | -23/+26 |
| * | | | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -3/+9 |
| | |_|/
|/| | |
|
| * | | | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -1/+2 |
| * | | | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 |
| |/ / |
|
| * | | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 1 | -3/+3 |
| |\| |
|
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -3/+3 |
