| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | put colorize method into key helper | Dominik Schürmann | 2014-03-20 | 5 | -80/+89 | |
| | | | | | | | ||||||
| * | | | | | | colorize fingerprint in import | Dominik Schürmann | 2014-03-20 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Use getter and setter | Dominik Schürmann | 2014-03-20 | 3 | -40/+111 | |
| | | | | | | | ||||||
| * | | | | | | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 7 | -88/+91 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #455 from ↵ | Dominik Schürmann | 2014-03-20 | 2 | -5/+15 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thi/454-fix-convert-key-id-to-hey-to-handle-short-key-ids 454 fix convert key id to hey to handle short key ids | |||||
| | * | | | | | | Add debug logging for hkp keyserver actions | Thialfihar | 2014-03-20 | 1 | -5/+10 | |
| | | | | | | | | ||||||
| | * | | | | | | Let convertKeyIdToHex handle short key IDs | Thialfihar | 2014-03-20 | 1 | -0/+5 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | If a short key ID is given, then it should only be displayed as such. | |||||
| * | | | | | | Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-red | Dominik Schürmann | 2014-03-20 | 1 | -1/+11 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix key list views in main key view | |||||
| | * | | | | | Fix key list views in main key view | Thialfihar | 2014-03-20 | 1 | -1/+11 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the views are being reused, a revoked key might set the text color of a view and when the view is being reused for a non-revoked key it is still red. So grab the default text colour and set it explicitly when the key is not revoked. | |||||
| * | | | | | Merge pull request #450 from uberspot/master | Dominik Schürmann | 2014-03-19 | 5 | -5/+9 | |
| |\ \ \ \ \ | | | | | | | | | | | | | add apg's fix for Key id display | |||||
| | * | | | | | add apg's fix for Key id display | uberspot | 2014-03-19 | 5 | -5/+9 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-19 | 4 | -17/+32 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge pull request #448 from AlexanderS/lint-fixes | Dominik Schürmann | 2014-03-19 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | use correct LongSparseArray for minimum api level | |||||
| | | * | | | | | use correct LongSparseArray for minimum api level | Alexander Sulfrian | 2014-03-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge pull request #445 from gogowitczak/rwrsa-branch | Dominik Schürmann | 2014-03-19 | 3 | -16/+31 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Disabled possibility to generate weak RSA keys (512 and 1024 bit) | |||||
| | | * | | | | | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 2 | -0/+8 | |
| | | | | | | | | ||||||
| | | * | | | | | Blocked ok button for generating weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -16/+23 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove oxygen text from icon | Dominik Schürmann | 2014-03-19 | 9 | -15/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Cleanup | Dominik Schürmann | 2014-03-19 | 1 | -2/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Cleanup SelectSecretKeyActivity and also return Uri | Dominik Schürmann | 2014-03-18 | 2 | -75/+26 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #443 from uberspot/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | CertifyKeyActivity sets error if no key is selected | |||||
| | * | | | | | | CertifyKeyActivity sets error if no key is selected | uberspot | 2014-03-18 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | revert ca_necrypt patch | Dominik Schürmann | 2014-03-18 | 1 | -4/+0 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #441 from uberspot/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+1 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix emails not showing up in import keyserver search | |||||
| | * | | | | | fix emails not showing up in import keyserver search | uberspot | 2014-03-18 | 1 | -2/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 7 | -6/+14931 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Show revocation status in ViewKeyKeysAdapter #375 | |||||
| | * \ \ \ \ | Merge branch 'revocation-status' of ↵ | Daniel Hammann | 2014-03-18 | 0 | -0/+0 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/honnel/openpgp-keychain into revocation-status Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | |||||
| | | * | | | | | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 7 | -6/+14931 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | |||||
| | * | | | | | | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 7 | -6/+14931 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | |||||
| * | | | | | | Merge pull request #437 from sreeram-boyapati/encrypt | Dominik Schürmann | 2014-03-18 | 1 | -1/+4 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Can_Encrypt Check added to hide Button | |||||
| | * | | | | | | Code Style fix | Sreeram Boyapati | 2014-03-18 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Can_Encrypt Check added to hide Button | Sreeram Boyapati | 2014-03-18 | 1 | -1/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #435 from sreeram-boyapati/change_passphrase | Dominik Schürmann | 2014-03-18 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Button Text changes to Change Passphrase if Passphrase is set | |||||
| | * | | | | | | | Button Text changes to Change Passphrase if Passphrase is set | Sreeram Boyapati | 2014-03-18 | 1 | -3/+5 | |
| | |/ / / / / / | ||||||
| * | | | | | | | add mr option in keyserver class before query (code simplification) | Dominik Schürmann | 2014-03-18 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 3 | -59/+117 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Machine readable output for Keyserver query | |||||
| | * | | | | | | | Fixed coding style. | gogowitczak | 2014-03-18 | 2 | -146/+153 | |
| | | | | | | | | | ||||||
| | * | | | | | | | removed TODO comment | gogowitczak | 2014-03-15 | 1 | -7/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 3 | -92/+150 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | separate function for converting algorithm integer ID to String. | |||||
| * | | | | | | | Merge pull request #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 3 | -4/+5 | |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Ui modification | |||||
| | * | | | | | | #429 4) | Daniel Hammann | 2014-03-17 | 3 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server' | |||||
| | * | | | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Daniel Hammann | 2014-03-14 | 142 | -3065/+2807 | |
| | |\| | | | | | ||||||
| | * | | | | | | Squashed commit of the following: | Daniel Hammann | 2014-03-12 | 1 | -6/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1df4d4a9e047f70f284183185d81070e49097ad3 Author: Daniel Hammann <github@honnel.de> Date: Wed Mar 12 21:33:13 2014 +0100 Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up). | |||||
| * | | | | | | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 14 | -216/+688 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revamp certify dialogue | |||||
| * \ \ \ \ \ \ \ | Merge pull request #420 from gogowitczak/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added FAQ: specifying connection port for Keyserver. | |||||
| | * | | | | | | | | Added FAQ: specifying connection port for Keyserver. | gogowitczak | 2014-03-14 | 1 | -2/+3 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #421 from uberspot/master | Dominik Schürmann | 2014-03-18 | 30 | -778/+991 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fix export for new unified key list #409 and lock drawer in tablets #255 | |||||
| | * | | | | | | | make loading of drawer items a bit more dynamic | uberspot | 2014-03-17 | 3 | -19/+28 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Lock drawer as open in tablets | uberspot | 2014-03-16 | 21 | -692/+863 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 9 | -79/+112 | |
| |/ / / / / / / | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |