| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Change keybase submodule to our fork | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Magic to find possible mails and names of device owner | Dominik Schürmann | 2014-06-28 | 5 | -5/+147 | |
| * | | More wizardry | Dominik Schürmann | 2014-06-27 | 5 | -104/+202 | |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-27 | 8 | -91/+257 | |
| |\ \ | ||||||
| | * | | Merge pull request #692 from da-kid/master | Dominik Schürmann | 2014-06-25 | 1 | -0/+8 | |
| | |\| | ||||||
| | | * | Temporary fix for #648 | Daniel Albert | 2014-06-25 | 1 | -0/+8 | |
| | |/ | ||||||
| | * | Merge pull request #690 from mar-v-in/hkps-by-default | Dominik Schürmann | 2014-06-25 | 6 | -90/+244 | |
| | |\ | ||||||
| | | * | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 5 | -41/+85 | |
| | | * | Merge branch 'master' into hkps-by-default | mar-v-in | 2014-06-24 | 16 | -66/+564 | |
| | | |\ | ||||||
| | | * | | 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 | |
| | | * | | Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into hkps... | mar-v-in | 2014-06-23 | 0 | -0/+0 | |
| | | |\ \ | ||||||
| | | | * | | Add TlsHelper (designed to be used with sks-keyservers.net) | mar-v-in | 2014-06-23 | 1 | -0/+83 | |
| | | * | | | 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 | |
| * | | | | | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 8 | -4/+622 | |
| * | | | | | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 7 | -58/+306 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'artbristol-functional-testing' | Dominik Schürmann | 2014-06-24 | 5 | -7/+95 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Merge submodules | Dominik Schürmann | 2014-06-24 | 5 | -7/+95 | |
| |/| | | | | | ||||||
| | * | | | | | https for submodules | Art O Cathain | 2014-06-23 | 1 | -1/+1 | |
| | * | | | | | borrow tests from Haskell OpenPGP | Art O Cathain | 2014-06-23 | 3 | -7/+92 | |
| | * | | | | | add OpenPGP-Haskell to test collateral | Art O Cathain | 2014-06-23 | 2 | -0/+3 | |
| * | | | | | | Rename registered apps to apps | Dominik Schürmann | 2014-06-24 | 1 | -2/+2 | |
| | |_|_|_|/ |/| | | | | ||||||
| * | | | | | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 7 | -20/+23 | |
| |\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | | Switch to dnsjava | mar-v-in | 2014-06-23 | 4 | -17/+20 | |
| | * | | | | Add minidns submodule | mar-v-in | 2014-06-23 | 2 | -0/+3 | |
| | * | | | | Remove dnsjava module | mar-v-in | 2014-06-23 | 2 | -3/+0 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge pull request #684 from da-kid/master | Dominik Schürmann | 2014-06-23 | 1 | -0/+6 | |
| |\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| | * | | Merge branch 'master' of https://github.com/da-kid/open-keychain | Daniel Albert | 2014-06-23 | 4 | -65/+116 | |
| | |\ \ | ||||||
| | * | | | Fixed Issue #683 which caused OK to crash upon importing keys which contain p... | Daniel Albert | 2014-06-23 | 1 | -0/+6 | |
| * | | | | remove margin in import keys (leftover from nav drawer) | Dominik Schürmann | 2014-06-23 | 1 | -2/+0 | |
| | |/ / |/| | | ||||||
| * | | | 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 | |
| | |/ / | ||||||
| * | | | Disable pre-dexing, causes exceptions on some systems | Dominik Schürmann | 2014-06-23 | 2 | -2/+6 | |
| * | | | new edit key: change passphrase | Dominik Schürmann | 2014-06-22 | 1 | -63/+107 | |
| |/ / | ||||||
| * | | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 8 | -36/+405 | |
| * | | 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 | 25 | -300/+584 | |
| | |\ | ||||||
| | * | | 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 | |
| * | | | add buttons in edit key | Dominik Schürmann | 2014-06-22 | 1 | -0/+64 | |
| | |/ |/| | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |