| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+5 |
| * | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+1 |
| * | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads... | Vincent Breitmoser | 2014-07-09 | 1 | -0/+1 |
| |\ | |||||
| | * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| * | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 1 | -0/+10 |
| |\ \ | |/ |/| | |||||
| | * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| * | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -5/+25 |
| |/ | |||||
| * | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 |
| * | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -7/+7 |
| * | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 4 | -26/+55 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 1 | -16/+15 |
| | |\ | |||||
| | * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 4 | -25/+54 |
| | |\ \ | |||||
| | | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| | | * | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 1 | -0/+3 |
| | | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 3 | -25/+49 |
| * | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 1 | -0/+1 |
| | |_|/ |/| | | |||||
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 1 | -0/+1 |
| |\| | | |||||
| | * | | forgot a line in previous commit | Vincent Breitmoser | 2014-07-02 | 1 | -0/+1 |
| * | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 1 | -16/+15 |
| |/ / | |||||
| * / | work on edit key | Dominik Schürmann | 2014-06-30 | 1 | -1/+2 |
| |/ | |||||
| * | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -0/+93 |
| * | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -13/+13 |
| * | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 1 | -0/+5 |
| * | use arraylists instead of arrays in savekeyringparcel | Vincent Breitmoser | 2014-06-22 | 1 | -14/+14 |
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ... | mar-v-in | 2014-06-19 | 1 | -0/+1 |
| |\ | |||||
| | * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| * | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 6 | -274/+464 |
| |\| | |||||
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 2 | -6/+23 |
| | |\ | |||||
| | | * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 1 | -2/+20 |
| | | |\ | |||||
| | | | * | Reset importDone at the beginning of sync | mar-v-in | 2014-06-18 | 1 | -0/+1 |
| | | | * | Wait for import to be done before writing contacts | mar-v-in | 2014-06-18 | 1 | -2/+19 |
| | * | | | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 4 | -266/+53 |
| | |\ \ \ | |||||
| | | * | | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 2 | -1/+26 |
| | | * | | | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -3/+3 |
| | | * | | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 3 | -263/+23 |
| | * | | | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -2/+3 |
| | | |/ / | |/| | | |||||
| | * | | | 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 | -1/+1 |
| | * | | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+6 |
| | * | | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+11 |
| | * | | | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -2/+2 |
| | * | | | 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 | -7/+33 |
| | * | | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 3 | -33/+222 |
| | |\| | |||||
| | * | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -0/+3 |
| | * | | 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 | -2/+9 |
| | * | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |