aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
* Added new button style and converted account_settings and the select_secret_k...Daniel Albert2014-06-292-9/+6
* Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
* Added button_rounded styleDaniel Albert2014-06-281-3/+3
* Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-271-11/+15
* Merge pull request #690 from mar-v-in/hkps-by-defaultDominik Schürmann2014-06-255-90/+212
|\
| * Move sks-keyservers.net CA into assets foldermar-v-in2014-06-254-41/+53
| * Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-2411-54/+475
| |\
| * | Fix sks-keyservers.net sub poolmar-v-in2014-06-241-1/+1
| * | Update Keyservers to use hkps as neededmar-v-in2014-06-243-2/+25
| * | Use URLEncoder instead of Uri.encodemar-v-in2014-06-241-2/+6
| * | Rewrote hkp add to work with hkps as well.mar-v-in2014-06-241-24/+13
| * | Few fixes on hkpsmar-v-in2014-06-232-35/+34
| * | 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
* | | Merge pull request #688 from da-kid/masterDominik Schürmann2014-06-241-1/+5
|\ \ \
| * | | Fix for #687Daniel Albert2014-06-241-1/+5
* | | | Merge submodulesDominik Schürmann2014-06-242-6/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | borrow tests from Haskell OpenPGPArt O Cathain2014-06-232-6/+25
* | | | Merge pull request #686 from mar-v-in/minidnsVincent2014-06-232-15/+18
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Switch to dnsjavamar-v-in2014-06-232-15/+18
* | | Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-232-63/+110
|\ \ \ | | |/ | |/|
| * | Merge pull request #681 from timbray/masterDominik Schürmann2014-06-231-0/+3
| |\ \
| | * | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| * | | new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
| |/ /
* / / Fixed Issue #683 which caused OK to crash upon importing keys which contain p...Daniel Albert2014-06-231-0/+6
|/ /
* | new edit key: diff for existing user idsDominik Schürmann2014-06-226-26/+384
* | 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-2213-283/+478
| |\
| * | 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
| |/ |/|
* | Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-216-51/+126
|\ \
| * | VERY basic test for save keyringArt O Cathain2014-06-216-51/+126
| |/
* | Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
* | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-212-222/+29
|\ \
| * | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-202-222/+29
* | | Start new designed activityDominik Schürmann2014-06-215-8/+326
| |/ |/|
* | 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-202-4/+48
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
* Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
* Merge pull request #658 from artbristol/functional-testingVincent2014-06-202-0/+92
|\
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:31:15 +0000