| Commit message (Expand) | Author | Age | Files | Lines |
* | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
* | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -0/+7 |
|\ |
|
| * | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 |
| * | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| * | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+3 |
| * | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -0/+6 |
* | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
* | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -0/+5 |
|\| |
|
| * | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -0/+5 |
* | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
* | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
* | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+8 |
|/ |
|
* | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 |
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -0/+10 |
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 |
* | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -4/+3 |
* | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+4 |
|\ |
|
| * | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| * | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -0/+2 |
* | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+1 |
|/ |
|
* | 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 |
* | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -8/+0 |
* | 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 |