| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | reformat merge | Dominik Schürmann | 2014-03-21 | 2 | -59/+64 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 6 | -140/+145 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | New Fix for #410 | |||||
| | | * | | | | | Fix GPL Headers | Nikhil Peter Raj | 2014-03-21 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 6 | -142/+147 | |
| | | | | | | | | ||||||
| | * | | | | | | URI is transported in intents data not extra. | Daniel Hammann | 2014-03-20 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge pull request #457 from hav3n/branch-fix-certify | Dominik Schürmann | 2014-03-20 | 2 | -72/+94 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix for #451 | |||||
| | | * | | | | | | Update fix for #451 | Nikhil Peter Raj | 2014-03-21 | 1 | -3/+2 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Cleanup for #451 | Nikhil Peter Raj | 2014-03-20 | 2 | -5/+0 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Fix for #451 | Nikhil Peter Raj | 2014-03-20 | 1 | -68/+96 | |
| | | |/ / / / / | ||||||
| | * | | | | | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 8 | -18/+15 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-20 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Group fingerprint again to make it visually consistent | Thialfihar | 2014-03-20 | 1 | -0/+5 | |
| | | |/ / / / / | ||||||
| | * / / / / / | verify downloaded key by comparing fingerprints | Dominik Schürmann | 2014-03-20 | 1 | -35/+45 | |
| | |/ / / / / | ||||||
| | * | | | | | 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 | 6 | -85/+87 | |
| | | | | | | | ||||||
| | * | | | | | 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. | |||||
| | * | | | | | 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. | |||||
| | * | | | | 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 | 2 | -17/+24 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | 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 | 1 | -16/+23 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | Disabled possibility to generate weak RSA keys (512 and 1024 bit) | |||||
| | | | * | | | | Blocked ok button for generating weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -16/+23 | |
| | | | | | | | | ||||||
| | * | | | | | | 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 | |
| | | | | | | | ||||||
| | * | | | | | 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 | |
| | | | | | | | ||||||
| | * | | | | | 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 | 2 | -6/+18 | |
| | |\ \ \ \ | | | | | | | | | | | | | Show revocation status in ViewKeyKeysAdapter #375 | |||||
| | | * | | | | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 2 | -6/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 9 | -208/+542 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Revamp certify dialogue | |||||
| | * | | | | | | 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 | 3 | -26/+64 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 8 | -79/+111 | |
| | | |/ / / / | |/| | | | | ||||||
| * | | | | | | Merge branch 'certify' into certs | Vincent Breitmoser | 2014-03-17 | 2 | -2/+10 | |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/res/values/strings.xml | |||||
| | * | | | | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 3 | -7/+72 | |
| | | | | | | | ||||||
| * | | | | | | certs: more filters, better initial uid selection, code cosmetics | Vincent Breitmoser | 2014-03-17 | 4 | -38/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add three types of filters for certificate list (ui looks like crap there, need to work on that) - select uncertified uids by default in CertifyKeyActivity - move some code around in KeychainProvider, 's slightly less hacky now | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |