| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix createUserId | Dominik Schürmann | 2016-04-29 | 1 | -1/+1 |
| * | Merge pull request #1819 from 007durgesh219/Issue#1817 | Dominik Schürmann | 2016-04-29 | 7 | -24/+32 |
| |\ | |||||
| | * | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 7 | -24/+32 |
| * | | Merge branch 'LuboViluda-master' | Dominik Schürmann | 2016-04-29 | 3 | -4/+76 |
| |\ \ | |||||
| | * | | Use proper ImportKeysProxyActivity to scan QR Codes | Dominik Schürmann | 2016-04-29 | 2 | -7/+8 |
| | * | | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into Lub... | Dominik Schürmann | 2016-04-29 | 3 | -4/+75 |
| |/| | | |||||
| | * | | unnecesary code removed | Lubo Viluda | 2016-04-12 | 2 | -7/+0 |
| | * | | Unnecesary code removed and string repaired | Lubo Viluda | 2016-04-12 | 4 | -11/+4 |
| | * | | Activity renamed | Lubo Viluda | 2016-04-04 | 1 | -2/+2 |
| | * | | Changed activity during RedirectKeysActivity | Lubo Viluda | 2016-04-04 | 1 | -6/+1 |
| | * | | Theme change | Lubo Viluda | 2016-03-24 | 2 | -2/+1 |
| | * | | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 5 | -98/+38 |
| | * | | #1661 - Don't expose CertifyActivity | Lubo Viluda | 2016-03-20 | 6 | -5/+156 |
| * | | | Use StringBuilder.append() according to lint | Dominik Schürmann | 2016-04-29 | 1 | -2/+6 |
| * | | | Re-enable move-to-card option, improve strings | Dominik Schürmann | 2016-04-29 | 5 | -96/+88 |
| * | | | Merge branch '007durgesh219-Issue#925' | Dominik Schürmann | 2016-04-29 | 3 | -1/+36 |
| |\ \ \ | |||||
| | * | | | Include only add button in dropdown width | Dominik Schürmann | 2016-04-29 | 1 | -2/+2 |
| | * | | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain in... | Dominik Schürmann | 2016-04-29 | 3 | -1/+36 |
| |/| | | | |||||
| | * | | | Add + button besides TokenAutoComplete, Issue #925 | Durgesh | 2016-04-14 | 3 | -1/+36 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #1816 from fiaxh/no_name_choose_email | Dominik Schürmann | 2016-04-29 | 4 | -9/+49 |
| |\ \ \ | |||||
| | * | | | Better handle user_id sidecases while splitting | fiaxh | 2016-04-12 | 3 | -5/+45 |
| | * | | | Use email field to match email in KeychainProvider | fiaxh | 2016-04-12 | 1 | -4/+4 |
| * | | | | Merge pull request #1831 from fiaxh/key_creation_flexible | Dominik Schürmann | 2016-04-29 | 7 | -85/+67 |
| |\ \ \ \ | |||||
| | * | | | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 7 | -85/+67 |
| * | | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt | Dominik Schürmann | 2016-04-29 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix Wrong file encrypted from cached input | Durgesh | 2016-04-15 | 1 | -0/+2 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Fix travis | Dominik Schürmann | 2016-04-29 | 1 | -0/+1 |
| * | | | | | Update more libraries | Dominik Schürmann | 2016-04-29 | 3 | -43/+44 |
| * | | | | | Update build config, gitignore after testing | Dominik Schürmann | 2016-04-29 | 2 | -20/+10 |
| * | | | | | Update build tools for travis | Dominik Schürmann | 2016-04-29 | 1 | -0/+1 |
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-29 | 6 | -43/+91 |
| |\ \ \ \ \ | |||||
| | * | | | | | api: allow caching of sessionKey in OpenPgpDecryptResult | Vincent Breitmoser | 2016-04-29 | 6 | -43/+91 |
| * | | | | | | Update libraries, add proguard filters to be under 64K limit | Dominik Schürmann | 2016-04-29 | 4 | -69/+68 |
| |/ / / / / | |||||
| * | | | | | Version 3.9.5 | Dominik Schürmann | 2016-04-29 | 1 | -2/+2 |
| * | | | | | New translations from transifex | Dominik Schürmann | 2016-04-29 | 60 | -660/+2222 |
| * | | | | | Fix strings | Dominik Schürmann | 2016-04-18 | 1 | -2/+2 |
| * | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 12 | -29/+48 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #1835 from nmikhailov/check_security_token | Dominik Schürmann | 2016-04-16 | 12 | -29/+48 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 2 | -8/+10 |
| | | * | | | | | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 3 | -5/+22 |
| | | * | | | | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 9 | -24/+24 |
| * | | | | | | | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 2 | -2/+3 |
| |/ / / / / / | |||||
| * | | | | | | Fix string | Dominik Schürmann | 2016-04-16 | 1 | -1/+1 |
| * | | | | | | Merge pull request #1824 from nmikhailov/otg2 | Dominik Schürmann | 2016-04-15 | 21 | -898/+1847 |
| |\| | | | | | |/ / / / |/| | | | | |||||
| | * | | | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 6 | -34/+34 |
| | * | | | | OTG: Skip TokenWaitFragmen when otg device is connected | Nikita Mikhailov | 2016-04-15 | 3 | -11/+27 |
| | * | | | | OTG: Fix connection issues | Nikita Mikhailov | 2016-04-15 | 3 | -24/+17 |
| | * | | | | OTG: Replace colons with dashes in usb error messages | Nikita Mikhailov | 2016-04-14 | 1 | -8/+8 |
| | * | | | | OTG: rename Smartcard -> SecurityToken | Nikita Mikhailov | 2016-04-14 | 13 | -129/+127 |
| | * | | | | OTG: rescan devices before next operation | Nikita Mikhailov | 2016-04-14 | 3 | -19/+58 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |