| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge pull request #479 from AlexanderS/subkey-expiry | Dominik Schürmann | 2014-03-26 | 2 | -1/+31 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Display expiry of subkeys in single key view. | |||||
| | * | | | | | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 2 | -1/+31 | |
| | | | | | | | ||||||
| * | | | | | | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 4 | -19/+26 | |
| | | | | | | | ||||||
| * | | | | | | Temporary fix for inserting by content provider | Dominik Schürmann | 2014-03-25 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #474 from honnel/empty-list-flash | Dominik Schürmann | 2014-03-25 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Empty list flash | |||||
| | * | | | | | | No "empty-list" layout flashing up on start of OpenKeychain | Daniel Hammann | 2014-03-23 | 1 | -2/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #475 from thi/master | Dominik Schürmann | 2014-03-25 | 19 | -0/+114 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add recent contributors to credits | |||||
| | * | | | | | | | Add recent contributors to credits | Thialfihar | 2014-03-24 | 19 | -0/+114 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 5 | -46/+60 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix update and insert for new api content provider | Dominik Schürmann | 2014-03-25 | 1 | -18/+14 | |
| | | | | | | | | ||||||
| * | | | | | | | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 9 | -86/+120 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #477 from thi/adjust-getting-started-text | Dominik Schürmann | 2014-03-25 | 17 | -17/+17 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Change the getting started text | |||||
| | * | | | | | | | Change the getting started text | Thialfihar | 2014-03-24 | 17 | -17/+17 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | "My Keys" is now wrapped into "Contacts". | |||||
| * | | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 31 | -111/+48 | |
| |\| | | | | | | ||||||
| | * | | | | | | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 11 | -23/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | |||||
| | * | | | | | | Remove icon set credits | Thialfihar | 2014-03-23 | 19 | -38/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | 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. | |||||
| | * | | | | | | Adjust encrypt layout, align signature with button | Thialfihar | 2014-03-23 | 1 | -2/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Adjust credits | Thialfihar | 2014-03-23 | 19 | -38/+19 | |
| | |/ / / / / | ||||||
| * | | | | | | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 22 | -434/+882 | |
| | | | | | | | ||||||
| * | | | | | | Extend provider for new api tables | Dominik Schürmann | 2014-03-23 | 4 | -41/+222 | |
| | | | | | | | ||||||
| * | | | | | | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 12 | -19/+24 | |
| | | | | | | | ||||||
| * | | | | | | New db table for api accounts | Dominik Schürmann | 2014-03-23 | 2 | -6/+25 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #469 from honnel/save-key-workaround | Dominik Schürmann | 2014-03-23 | 1 | -1/+9 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Can't save key after key generation | |||||
| | * | | | | | The current implementation of saving new generated key doesn't save the key ↵ | Daniel Hammann | 2014-03-22 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. | |||||
| * | | | | | | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 2 | -59/+15 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-22 | 7 | -150/+336 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge pull request #467 from uberspot/master | Dominik Schürmann | 2014-03-22 | 6 | -140/+329 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make foldable settings in EncryptActivity into a separate widget | |||||
| | | * | | | | | | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 6 | -140/+329 | |
| | | |/ / / / / | ||||||
| | * / / / / / | Because of an unknown reason toast messages were commented out. | Daniel Hammann | 2014-03-21 | 1 | -10/+7 | |
| | |/ / / / / | ||||||
| * / / / / / | raname to mKeychainDatabase | Dominik Schürmann | 2014-03-21 | 1 | -6/+6 | |
| |/ / / / / | ||||||
| * | | | | | Fix nfc help button | Dominik Schürmann | 2014-03-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | remove ach language, not supported by android | Dominik Schürmann | 2014-03-21 | 6 | -222/+0 | |
| | | | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2014-03-21 | 24 | -0/+1311 | |
| | | | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2014-03-21 | 21 | -92/+294 | |
| | | | | | | ||||||
| * | | | | | 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 | 8 | -140/+185 | |
| |\ \ \ \ \ | | | | | | | | | | | | | 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 | 8 | -142/+187 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #461 from honnel/ui-tasks | Dominik Schürmann | 2014-03-21 | 2 | -3/+7 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | UI-Icon-Modifying #429 | |||||
| | * | | | | | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 2 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clipboard button | |||||
| * | | | | | | | 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 | 9 | -21/+19 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-20 | 3 | -23/+28 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification. | |||||
| | * | | | | | | Move fingerprint to the right in key list entry | Thialfihar | 2014-03-20 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fits much better there and doesn't separate the user ID. | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenPGP-Keychain