| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | work on edit key | Dominik Schürmann | 2014-06-30 | 4 | -34/+82 |
| * | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 4 | -83/+119 |
| * | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 3 | -3/+20 |
| * | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 8 | -144/+117 |
| * | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-06-28 | 11 | -71/+855 |
| |\ | |||||
| | * | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 3 | -4/+145 |
| | * | More wizardry | Dominik Schürmann | 2014-06-27 | 3 | -89/+159 |
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-27 | 6 | -91/+217 |
| | |\ | |||||
| | * | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 2 | -4/+399 |
| | * | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 5 | -58/+236 |
| * | | | Added unlock icon, fixed drawer items, switched to icons from resource in drawer | Daniel Albert | 2014-06-27 | 1 | -11/+15 |
| | |/ |/| | |||||
| * | | Merge pull request #690 from mar-v-in/hkps-by-default | Dominik Schürmann | 2014-06-25 | 5 | -90/+212 |
| |\ \ | |||||
| | * | | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 4 | -41/+53 |
| | * | | Merge branch 'master' into hkps-by-default | mar-v-in | 2014-06-24 | 11 | -54/+475 |
| | |\ \ | |||||
| | * | | | Fix sks-keyservers.net sub pool | mar-v-in | 2014-06-24 | 1 | -1/+1 |
| | * | | | Update Keyservers to use hkps as needed | mar-v-in | 2014-06-24 | 3 | -2/+25 |
| | * | | | Use URLEncoder instead of Uri.encode | mar-v-in | 2014-06-24 | 1 | -2/+6 |
| | * | | | Rewrote hkp add to work with hkps as well. | mar-v-in | 2014-06-24 | 1 | -24/+13 |
| | * | | | Few fixes on hkps | mar-v-in | 2014-06-23 | 2 | -35/+34 |
| | * | | | Add hkps support for sks-keyservers.net | mar-v-in | 2014-06-23 | 2 | -65/+77 |
| | * | | | Add TlsHelper (designed to be used with sks-keyservers.net) | mar-v-in | 2014-06-23 | 1 | -0/+83 |
| * | | | | Merge pull request #688 from da-kid/master | Dominik Schürmann | 2014-06-24 | 1 | -1/+5 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | Fix for #687 | Daniel Albert | 2014-06-24 | 1 | -1/+5 |
| * | | | | Merge submodules | Dominik Schürmann | 2014-06-24 | 2 | -6/+25 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | borrow tests from Haskell OpenPGP | Art O Cathain | 2014-06-23 | 2 | -6/+25 |
| * | | | | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 2 | -15/+18 |
| |\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| | * | | Switch to dnsjava | mar-v-in | 2014-06-23 | 2 | -15/+18 |
| * | | | Merge branch 'master' of https://github.com/da-kid/open-keychain | Daniel Albert | 2014-06-23 | 2 | -63/+110 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #681 from timbray/master | Dominik Schürmann | 2014-06-23 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * | | Handle empty keybase.io query, should fix #675 | Tim Bray | 2014-06-22 | 1 | -0/+3 |
| | * | | | new edit key: change passphrase | Dominik Schürmann | 2014-06-22 | 1 | -63/+107 |
| | |/ / | |||||
| * / / | Fixed Issue #683 which caused OK to crash upon importing keys which contain p... | Daniel Albert | 2014-06-23 | 1 | -0/+6 |
| |/ / | |||||
| * | | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 6 | -26/+384 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-22 | 7 | -131/+93 |
| |\| | |||||
| | * | ditch outdated certifyKey operation | Vincent Breitmoser | 2014-06-22 | 1 | -54/+0 |
| | * | use arraylists instead of arrays in savekeyringparcel | Vincent Breitmoser | 2014-06-22 | 1 | -14/+14 |
| | * | fix indentation in various key import methods | Vincent Breitmoser | 2014-06-22 | 1 | -60/+64 |
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-22 | 13 | -283/+478 |
| | |\ | |||||
| | * | | fix parcel method in ParcelableKeyRing | Vincent Breitmoser | 2014-06-22 | 1 | -1/+3 |
| | * | | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 3 | -2/+12 |
| * | | | Rename adapter | Dominik Schürmann | 2014-06-22 | 6 | -29/+39 |
| | |/ |/| | |||||
| * | | Merge pull request #672 from artbristol/functional-testing | Dominik Schürmann | 2014-06-21 | 6 | -51/+126 |
| |\ \ | |||||
| | * | | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 6 | -51/+126 |
| | |/ | |||||
| * | | Cleanup pull keybase code | Dominik Schürmann | 2014-06-21 | 1 | -6/+1 |
| * | | Merge pull request #668 from timbray/master | Dominik Schürmann | 2014-06-21 | 2 | -222/+29 |
| |\ \ | |||||
| | * | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 2 | -222/+29 |
| * | | | Start new designed activity | Dominik Schürmann | 2014-06-21 | 5 | -8/+326 |
| | |/ |/| | |||||
| * | | Fix qr code finally | Dominik Schürmann | 2014-06-20 | 4 | -19/+31 |
| * | | import: forward motion events to activity regardless | Vincent Breitmoser | 2014-06-20 | 1 | -0/+12 |
| * | | Work on Qr code import | Dominik Schürmann | 2014-06-20 | 5 | -43/+70 |
| |/ | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |