Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 5 | -58/+236 |
* | 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 |
|/ | |||||
* | Fix keybase import | Dominik Schürmann | 2014-06-20 | 3 | -2/+5 |
* | Use actionbar button for log activity | Dominik Schürmann | 2014-06-20 | 2 | -4/+48 |
* | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -6/+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 | 2 | -0/+92 |
|\ | |||||
| * | Fix hard-coded size | Art O Cathain | 2014-06-16 | 1 | -3/+6 |
| * | Start on Robolectric integration test | Art O Cathain | 2014-06-16 | 2 | -0/+89 |
* | | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ... | mar-v-in | 2014-06-19 | 14 | -379/+193 |
|\ \ | |||||
| * | | 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 | 1 | -77/+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 |
| |/ / | |||||
| * | | forward touch events to pager in import activity | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 |
| * | | fix key export | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| * | | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 2 | -1/+4 |
* | | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 36 | -1803/+2673 |
|\| | | |||||
| * | | 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 |