| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge submodules | Dominik Schürmann | 2014-06-24 | 4 | -7/+92 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | 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 | 2 | -15/+18 | |
| |\ \ \ \ | | |_|/ | |/| | | Use minidns instead of dnsjava | |||||
| | * | | | Switch to dnsjava | mar-v-in | 2014-06-23 | 2 | -15/+18 | |
| | | | | | ||||||
| * | | | | Merge pull request #684 from da-kid/master | Dominik Schürmann | 2014-06-23 | 1 | -0/+6 | |
| |\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | Fix of #683 | |||||
| | * | | Merge branch 'master' of https://github.com/da-kid/open-keychain | Daniel Albert | 2014-06-23 | 2 | -63/+110 | |
| | |\ \ | ||||||
| | * | | | Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵ | Daniel Albert | 2014-06-23 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | percent signs. | |||||
| * | | | | 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 | |||||
| | * | | | 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 | |
| |/ / | ||||||
| * | | 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 | 19 | -284/+577 | |
| | |\ | ||||||
| | * | | 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 | |
| | |/ |/| | ||||||
| * | | Revert hint_keybase_search | Dominik Schürmann | 2014-06-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #672 from artbristol/functional-testing | Dominik Schürmann | 2014-06-21 | 8 | -52/+147 | |
| |\ \ | | | | | | | VERY basic test for save keyring | |||||
| | * | | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 8 | -52/+147 | |
| | |/ | ||||||
| * | | 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 | 3 | -223/+30 | |
| |\ \ | | | | | | | Moved Keybase stuff into KeybaseLib submodule | |||||
| | * | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 3 | -223/+30 | |
| | | | | ||||||
| * | | | Start new designed activity | Dominik Schürmann | 2014-06-21 | 9 | -8/+404 | |
| | |/ |/| | ||||||
| * | | 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 | |
| |/ | ||||||
| * | Fix keybase import | Dominik Schürmann | 2014-06-20 | 3 | -2/+5 | |
| | | ||||||
| * | Use actionbar button for log activity | Dominik Schürmann | 2014-06-20 | 3 | -34/+48 | |
| | | ||||||
| * | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 2 | -14/+7 | |
| | | ||||||
| * | Fix update from keyserver flow | Dominik Schürmann | 2014-06-20 | 2 | -5/+7 | |
| | | ||||||
| * | Merge pull request #658 from artbristol/functional-testing | Vincent | 2014-06-20 | 7 | -12/+181 | |
| |\ | | | | | Start on Robolectric integration test | |||||
| | * | Fix hard-coded size | Art O Cathain | 2014-06-16 | 1 | -3/+6 | |
| | | | ||||||
| | * | Start on Robolectric integration test | Art O Cathain | 2014-06-16 | 7 | -12/+178 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵ | mar-v-in | 2014-06-19 | 37 | -428/+206 | |
| |\ \ | | | | | | | | | | improve-file | |||||
| | * | | Fix app name in PGP header, closing #663 | Dominik Schürmann | 2014-06-19 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fixing fingerprint search, part 1 | Dominik Schürmann | 2014-06-19 | 1 | -80/+88 | |
| | | | | ||||||
| | * | | Remove unused code to import splitted qr codes | Dominik Schürmann | 2014-06-19 | 2 | -96/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-19 | 3 | -124/+3 | |
| | |\ \ | ||||||
| | | * | | remove obsolete subkey binding check from signature verification | Vincent Breitmoser | 2014-06-19 | 3 | -124/+3 | |
| | | | | | ||||||
| | * | | | New callback model for ImportKeysActivity | Dominik Schürmann | 2014-06-19 | 7 | -108/+95 | |
| | |/ / | ||||||
| | * | | Reference ic_launcher instead of icon | Dominik Schürmann | 2014-06-18 | 4 | -4/+4 | |
| | | | | ||||||
| | * | | decrease size of search icons in import | Dominik Schürmann | 2014-06-18 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | forward touch events to pager in import activity | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 | |
| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |