| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge master | Ashley Hughes | 2014-03-29 | 63 | -2339/+2823 |
| |\ | |||||
| | * | Show divider only when used | Dominik Schürmann | 2014-03-26 | 1 | -0/+6 |
| | * | fix capability icons and remove red text for revoked keys | uberspot | 2014-03-26 | 1 | -4/+0 |
| | * | add strike through text for revoked or expired keys and disable views for rev... | uberspot | 2014-03-26 | 1 | -4/+19 |
| | * | Simplify can encrypt check | Dominik Schürmann | 2014-03-26 | 1 | -19/+24 |
| | * | Merge pull request #471 from sreeram-boyapati/encryption | Dominik Schürmann | 2014-03-26 | 1 | -1/+11 |
| | |\ | |||||
| | | * | Added can_encrypt check | Sreeram Boyapati | 2014-03-23 | 1 | -1/+11 |
| | * | | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 1 | -0/+22 |
| | * | | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 8 | -19/+19 |
| | * | | Fix file decryption interface | Thialfihar | 2014-03-23 | 1 | -10/+3 |
| | * | | Merge pull request #467 from uberspot/master | Dominik Schürmann | 2014-03-22 | 2 | -47/+203 |
| | |\ \ | |||||
| | | * | | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 2 | -47/+203 |
| | * | | | Because of an unknown reason toast messages were commented out. | Daniel Hammann | 2014-03-21 | 1 | -10/+7 |
| | |/ / | |||||
| | * | | Fix nfc help button | Dominik Schürmann | 2014-03-21 | 1 | -1/+1 |
| | * | | 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 | 4 | -132/+128 |
| | |\ \ | |||||
| | | * | | Fix GPL Headers | Nikhil Peter Raj | 2014-03-21 | 2 | -2/+2 |
| | | * | | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 4 | -133/+129 |
| | * | | | 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 |
| | |\ \ \ | |||||
| | | * | | | 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 | 5 | -5/+7 |
| | |/ / | |||||
| | * | | put colorize method into key helper | Dominik Schürmann | 2014-03-20 | 3 | -3/+3 |
| | * | | colorize fingerprint in import | Dominik Schürmann | 2014-03-20 | 1 | -1/+3 |
| | * | | Use getter and setter | Dominik Schürmann | 2014-03-20 | 2 | -28/+94 |
| | * | | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 2 | -23/+26 |
| | * | | Fix key list views in main key view | Thialfihar | 2014-03-20 | 1 | -1/+11 |
| | |/ | |||||
| | * | add apg's fix for Key id display | uberspot | 2014-03-19 | 4 | -4/+4 |
| | * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-19 | 1 | -16/+23 |
| | |\ | |||||
| | | * | Merge pull request #445 from gogowitczak/rwrsa-branch | Dominik Schürmann | 2014-03-19 | 1 | -16/+23 |
| | | |\ | |||||
| | | | * | 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 |
| | |/ | |||||
| | * | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 2 | -6/+18 |
| | |\ | |||||
| | | * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 2 | -6/+18 |
| | * | | Merge pull request #437 from sreeram-boyapati/encrypt | Dominik Schürmann | 2014-03-18 | 1 | -1/+4 |
| | |\ \ | |||||
| | | * | | 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 | Sreeram Boyapati | 2014-03-18 | 1 | -3/+5 |
| | | |/ | |||||
| | * | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 1 | -15/+27 |
| | |\ \ | |||||
| | | * | | Fixed coding style. | gogowitczak | 2014-03-18 | 1 | -26/+23 |
| | | * | | Keyserver query now uses machine readable output for search and get. Added se... | gogowitczak | 2014-03-15 | 1 | -15/+30 |
| | | |/ | |||||
| | * | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 4 | -79/+220 |
| | |\ \ | |||||
| | | * | | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 1 | -6/+13 |
| | | * | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -1/+96 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |