| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1819 from 007durgesh219/Issue#1817 | Dominik Schürmann | 2016-04-29 | 6 | -24/+31 |
|\ |
|
| * | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 6 | -24/+31 |
* | | Use proper ImportKeysProxyActivity to scan QR Codes | Dominik Schürmann | 2016-04-29 | 1 | -5/+6 |
* | | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into Lub... | Dominik Schürmann | 2016-04-29 | 1 | -0/+58 |
|\ \ |
|
| * | | unnecesary code removed | Lubo Viluda | 2016-04-12 | 1 | -1/+0 |
| * | | Unnecesary code removed and string repaired | Lubo Viluda | 2016-04-12 | 1 | -1/+1 |
| * | | 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 | 1 | -1/+0 |
| * | | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 1 | -23/+28 |
| * | | #1661 - Don't expose CertifyActivity | Lubo Viluda | 2016-03-20 | 1 | -0/+60 |
* | | | 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 | 4 | -89/+81 |
* | | | 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 | 2 | -0/+27 |
|\ \ \ |
|
| * | | | Add + button besides TokenAutoComplete, Issue #925 | Durgesh | 2016-04-14 | 2 | -0/+27 |
| | |/
| |/| |
|
* | | | Merge pull request #1816 from fiaxh/no_name_choose_email | Dominik Schürmann | 2016-04-29 | 3 | -6/+15 |
|\ \ \ |
|
| * | | | Better handle user_id sidecases while splitting | fiaxh | 2016-04-12 | 2 | -2/+11 |
| * | | | 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 | 5 | -83/+60 |
|\ \ \ \ |
|
| * | | | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 5 | -83/+60 |
* | | | | | 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 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-29 | 5 | -43/+91 |
|\ \ \ \ \ |
|
| * | | | | | api: allow caching of sessionKey in OpenPgpDecryptResult | Vincent Breitmoser | 2016-04-29 | 5 | -43/+91 |
* | | | | | | Update libraries, add proguard filters to be under 64K limit | Dominik Schürmann | 2016-04-29 | 1 | -1/+2 |
|/ / / / / |
|
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 11 | -29/+47 |
|\ \ \ \ \ |
|
| * | | | | | 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 | 2 | -5/+21 |
| * | | | | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 9 | -24/+24 |
* | | | | | | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 1 | -1/+2 |
|/ / / / / |
|
* | | | | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 5 | -29/+29 |
* | | | | | 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 | 7 | -66/+68 |
* | | | | | 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 |
* | | | | | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 6 | -932/+66 |
* | | | | | 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 |