aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge submodulesDominik Schürmann2014-06-244-7/+92
|\
| * borrow tests from Haskell OpenPGPArt O Cathain2014-06-233-7/+92
| |
| * add OpenPGP-Haskell to test collateralArt O Cathain2014-06-231-0/+0
| |
* | Rename registered apps to appsDominik Schürmann2014-06-241-2/+2
| |
* | Merge pull request #686 from mar-v-in/minidnsVincent2014-06-233-16/+19
|\ \ | | | | | | Use minidns instead of dnsjava
| * | Switch to dnsjavamar-v-in2014-06-233-16/+19
| | |
* | | 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-233-64/+115
| |\ \
| * | | 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-231-1/+5
| | |
* | | 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-2220-299/+579
| |\
| * | 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
| |/ |/|
* | 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-214-223/+31
|\ \ | | | | | | Moved Keybase stuff into KeybaseLib submodule
| * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-204-223/+31
| | |
* | | 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
|
* Use actionbar button for log activityDominik Schürmann2014-06-203-34/+48
|
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-202-14/+7
|
* Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
|
* Merge pull request #658 from artbristol/functional-testingVincent2014-06-208-41/+203
|\ | | | | Start on Robolectric integration test
| * revert to previous min versionArt O Cathain2014-06-191-1/+1
| |
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| |
| * Start on Robolectric integration testArt O Cathain2014-06-168-42/+201
| |
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵mar-v-in2014-06-1937-428/+206
|\ \ | | | | | | | | | improve-file
| * | Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
| | |
| * | Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| | |
| * | Remove unused code to import splitted qr codesDominik Schürmann2014-06-192-96/+1
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-193-124/+3
| |\ \
| | * | remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
| | | |
| * | | New callback model for ImportKeysActivityDominik Schürmann2014-06-197-108/+95
| |/ /
| * | Reference ic_launcher instead of iconDominik Schürmann2014-06-184-4/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:51:58 +0000