| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 20 | -299/+579 |
| |\ | |||||
| | * | 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 | 9 | -67/+148 |
| | |\ | |||||
| | | * | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 9 | -67/+148 |
| | * | | 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 | 4 | -223/+31 |
| | |\ \ | |||||
| | | * | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 4 | -223/+31 |
| | * | | | Start new designed activity | Dominik Schürmann | 2014-06-21 | 9 | -8/+404 |
| | | |/ | |/| | |||||
| * | | | 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 |
| |/ / | |||||
| * | | 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 | 8 | -41/+203 |
| |\ | |||||
| | * | revert to previous min version | Art O Cathain | 2014-06-19 | 1 | -1/+1 |
| | * | Fix hard-coded size | Art O Cathain | 2014-06-16 | 1 | -3/+6 |
| | * | Start on Robolectric integration test | Art O Cathain | 2014-06-16 | 8 | -42/+201 |
| * | | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ... | mar-v-in | 2014-06-19 | 37 | -428/+206 |
| |\ \ | |||||
| | * | | 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 |
| | * | | Fix new actionbar icon sizes, rename icon to ic_launcher following Android na... | Dominik Schürmann | 2014-06-18 | 16 | -3/+3 |
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 4 | -5/+9 |
| | |\ \ | |||||
| | | * | | fix key export | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | | * | | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 3 | -4/+8 |
| | * | | | consistent button design in import activity | Dominik Schürmann | 2014-06-18 | 2 | -18/+0 |
| | |/ / | |||||
| * | | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 75 | -2062/+3204 |
| |\| | | |||||
| | * | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 3 | -57/+201 |
| | |\ \ | |||||
| | | * \ | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 2 | -53/+198 |
| | | |\ \ | |||||
| | | | * | | 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 |
| | | | * | | Remove abandoned contacts | mar-v-in | 2014-06-18 | 1 | -26/+90 |
| | | | * | | Code style | mar-v-in | 2014-06-18 | 1 | -13/+26 |
| | | | * | | Continue contact db sync | mar-v-in | 2014-06-18 | 1 | -39/+89 |
| | * | | | | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 9 | -991/+315 |
| | |\ \ \ \ | |||||
| | | * | | | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 4 | -72/+158 |
| | | * | | | | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 3 | -151/+124 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain