| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge pull request #471 from sreeram-boyapati/encryption | Dominik Schürmann | 2014-03-26 | 1 | -1/+11 | |
| |\ \ \ \ | | | | | | | | | | | Added can_encrypt check | |||||
| | * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | |||||
| * | | | | | Fix file decryption interface | Thialfihar | 2014-03-23 | 1 | -10/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually use mAssumeSymmetricEncryption and set it to false as default. Don't close the file input stream, so we can actually look for PGP encrypted data in the next step. | |||||
| * | | | | | Merge pull request #467 from uberspot/master | Dominik Schürmann | 2014-03-22 | 2 | -47/+203 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Make foldable settings in EncryptActivity into a separate widget | |||||
| | * | | | | | 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 | |
| |\ \ \ \ \ | | | | | | | | | | | | | New Fix for #410 | |||||
| | * | | | | | 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 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | 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 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | |
| | |\ \ \ \ | | | | | | | | | | | | | 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 | |
| |/ / / / | ||||||
| * | | | | 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 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 1 | -15/+27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Machine readable output for Keyserver query | |||||
| | * | | | | | Fixed coding style. | gogowitczak | 2014-03-18 | 1 | -26/+23 | |
| | | | | | | | ||||||
| | * | | | | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 1 | -15/+30 | |
| | |/ / / / | | | | | | | | | | | | | | | | separate function for converting algorithm integer ID to String. | |||||
| * | | | | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 4 | -79/+220 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Revamp certify dialogue | |||||
| | * | | | | | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 1 | -6/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now. | |||||
| | * | | | | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -1/+96 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | |||||
| | * | | | | | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 2 | -12/+82 | |
| | | | | | | | ||||||
| | * | | | | | certify: selectsecretkeyfragment cosmetics | Vincent Breitmoser | 2014-03-15 | 1 | -3/+10 | |
| | | | | | | | ||||||
| | * | | | | | certify: add certify action button to viewkeymainfragment | Vincent Breitmoser | 2014-03-15 | 1 | -0/+21 | |
| | | | | | | | ||||||
| | * | | | | | move fingerprint coloring into helper | Vincent Breitmoser | 2014-03-15 | 2 | -61/+2 | |
| | |/ / / / | ||||||
| * | | | | | make loading of drawer items a bit more dynamic | uberspot | 2014-03-17 | 2 | -19/+14 | |
| | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |