aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-230-0/+0
| | |\ \ | | | | | | | | | | | | | | | hkps-by-default
| | | * | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | | | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
| | * | | Few fixes on hkpsmar-v-in2014-06-232-35/+34
| | | | | | | | | | | | | | | | | | | | TODO: Fix add as well
| | * | | Add hkps support for sks-keyservers.netmar-v-in2014-06-232-65/+77
| | | | |
| | * | | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | | | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
| * | | | Merge pull request #688 from da-kid/masterDominik Schürmann2014-06-241-1/+5
| |\ \ \ \ | | | | | | | | | | | | Fix for #687
| | * | | | Fix for #687Daniel Albert2014-06-241-1/+5
| | | | | |
* | | | | | Start work on a first-time wizardDominik Schürmann2014-06-278-4/+622
| | | | | |
* | | | | | new edit key: first version to add user idsDominik Schürmann2014-06-247-58/+306
|/ / / / /
* | | | | Merge branch 'artbristol-functional-testing'Dominik Schürmann2014-06-245-7/+95
|\ \ \ \ \
| * | | | | Merge submodulesDominik Schürmann2014-06-245-7/+95
|/| | | | |
| * | | | | https for submodulesArt O Cathain2014-06-231-1/+1
| | | | | |
| * | | | | borrow tests from Haskell OpenPGPArt O Cathain2014-06-233-7/+92
| | | | | |
| * | | | | add OpenPGP-Haskell to test collateralArt O Cathain2014-06-232-0/+3
| | | | | |
* | | | | | Rename registered apps to appsDominik Schürmann2014-06-241-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #686 from mar-v-in/minidnsVincent2014-06-237-20/+23
|\ \ \ \ \ | | |_|/ / | |/| | | Use minidns instead of dnsjava
| * | | | Switch to dnsjavamar-v-in2014-06-234-17/+20
| | | | |
| * | | | Add minidns submodulemar-v-in2014-06-232-0/+3
| | | | |
| * | | | Remove dnsjava modulemar-v-in2014-06-232-3/+0
| | |_|/ | |/| |
* | | | Merge pull request #684 from da-kid/masterDominik Schürmann2014-06-231-0/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Fix of #683
| * | Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-234-65/+116
| |\ \
| * | | Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵Daniel Albert2014-06-231-0/+6
| | | | | | | | | | | | | | | | percent signs.
* | | | remove margin in import keys (leftover from nav drawer)Dominik Schürmann2014-06-231-2/+0
| |/ / |/| |
* | | Merge pull request #681 from timbray/masterDominik Schürmann2014-06-231-0/+3
|\ \ \ | | | | | | | | Handle empty keybase.io query, should fix #675
| * | | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| |/ /
* | | Disable pre-dexing, causes exceptions on some systemsDominik Schürmann2014-06-232-2/+6
| | |
* | | new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
|/ /
* | new edit key: diff for existing user idsDominik Schürmann2014-06-228-36/+405
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-227-131/+93
|\|
| * ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
| |
| * use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
| |
| * fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-2225-300/+584
| |\
| * | fix parcel method in ParcelableKeyRingVincent Breitmoser2014-06-221-1/+3
| | |
| * | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-223-2/+12
| | |
* | | Rename adapterDominik Schürmann2014-06-226-29/+39
| | |
* | | add buttons in edit keyDominik Schürmann2014-06-221-0/+64
| |/ |/|
* | Update libDominik Schürmann2014-06-221-0/+0
| |
* | Revert hint_keybase_searchDominik Schürmann2014-06-221-1/+1
| |
* | Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-219-67/+148
|\ \ | | | | | | VERY basic test for save keyring
| * | VERY basic test for save keyringArt O Cathain2014-06-219-67/+148
| |/
* | Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| |
* | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-218-224/+36
|\ \ | | | | | | Moved Keybase stuff into KeybaseLib submodule
| * | Committed submoduleTim Bray2014-06-211-0/+0
| | |
| * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-208-224/+36
| | |
* | | Start new designed activityDominik Schürmann2014-06-219-8/+404
| |/ |/|
* | Fix qr code finallyDominik Schürmann2014-06-204-19/+31
| |
* | import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
| |
* | Work on Qr code importDominik Schürmann2014-06-205-43/+70
|/
* Fix keybase importDominik Schürmann2014-06-203-2/+5
|