Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Dominik Schürmann | 2016-04-29 | 3 | -1/+36 |
|/| | | | | | | | into 007durgesh219-Issue#925 | ||||
| * | Add + button besides TokenAutoComplete, Issue #925 | Durgesh | 2016-04-14 | 3 | -1/+36 |
| | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | | Merge pull request #1816 from fiaxh/no_name_choose_email | Dominik Schürmann | 2016-04-29 | 4 | -9/+49 |
|\ \ | | | | | | | Correctly handle keys only having an email address | ||||
| * | | 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 |
| | | | | | | | | | | | | fixes #1699 | ||||
* | | | 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 | ||||
| * | | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 7 | -85/+67 |
| | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825 | ||||
* | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt | Dominik Schürmann | 2016-04-29 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Fix Wrong file encrypted from cached input | ||||
| * | | | | Fix Wrong file encrypted from cached input | Durgesh | 2016-04-15 | 1 | -0/+2 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | | | | 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 security token | ||||
| | * | | | | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint | ||||
| | * | | | | 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 |
|\| | | | | |/ / / |/| | | | [WIP] USB OTG Support for Yubikey | ||||
| * | | | 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 |
| | | | | |||||
| * | | | OTG: Add copyright | Nikita Mikhailov | 2016-04-14 | 1 | -0/+17 |
| | | | | |||||
| * | | | OTG: fix icc powering method | Nikita Mikhailov | 2016-04-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | OTG: Add/Update copyrights | Nikita Mikhailov | 2016-04-14 | 10 | -0/+143 |
| | | | | |||||
| * | | | OTG: Remove obsolete Pin classes, reenable changeKey method | Nikita Mikhailov | 2016-04-14 | 4 | -93/+24 |
| | | | | |||||
| * | | | OTG: move UsbConnectionDispatcher to utls package | Nikita Mikhailov | 2016-04-14 | 3 | -11/+7 |
| | | | | |||||
| * | | | OTG: UsbTransport minor refactoring | Nikita Mikhailov | 2016-04-14 | 1 | -11/+22 |
| | | | | |||||
| * | | | OTG: Add/update javadoc; rename methods, exceptions | Nikita Mikhailov | 2016-04-14 | 8 | -115/+173 |
| | | | | |||||
| * | | | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 8 | -72/+73 |
| | | | | |||||
| * | | | OTG: Refactor persistent connections, naming | Nikita Mikhailov | 2016-04-14 | 9 | -118/+132 |
| | | | | |||||
| * | | | OTG: Add support for persistent usb connection | Nikita Mikhailov | 2016-04-14 | 8 | -111/+132 |
| | | | | | | | | | | | | | | | | No need to reinsert token on each operation | ||||
| * | | | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 8 | -933/+108 |
| | | | | |||||
| * | | | OTG: Rename 'javacard' package, methods, remove JavacardInterface | Nikita Mikhailov | 2016-04-14 | 16 | -67/+770 |
| | | | | |||||
| * | | | OTG: Fix usb transport | Nikita Mikhailov | 2016-04-14 | 3 | -43/+108 |
| | | | |