| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | | 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 #1831 from fiaxh/key_creation_flexible | Dominik Schürmann | 2016-04-29 | 4 | -75/+50 |
| |\ \ \ |
|
| | * | | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 4 | -75/+50 |
| * | | | | 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 |
| | | |/ /
| |/| | |
|
| * | | | | Update libraries, add proguard filters to be under 64K limit | Dominik Schürmann | 2016-04-29 | 1 | -1/+2 |
| * | | | | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 1 | -4/+4 |
| * | | | | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 1 | -0/+16 |
| * | | | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 1 | -1/+1 |
| * | | | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 3 | -17/+17 |
| * | | | | 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 | 1 | -4/+9 |
| * | | | | OTG: rename Smartcard -> SecurityToken | Nikita Mikhailov | 2016-04-14 | 5 | -115/+113 |
| * | | | | OTG: rescan devices before next operation | Nikita Mikhailov | 2016-04-14 | 1 | -7/+3 |
| * | | | | OTG: Add copyright | Nikita Mikhailov | 2016-04-14 | 1 | -0/+17 |
| * | | | | OTG: Add/Update copyrights | Nikita Mikhailov | 2016-04-14 | 2 | -0/+2 |
| * | | | | OTG: Remove obsolete Pin classes, reenable changeKey method | Nikita Mikhailov | 2016-04-14 | 1 | -53/+1 |
| * | | | | OTG: move UsbConnectionDispatcher to utls package | Nikita Mikhailov | 2016-04-14 | 1 | -3/+2 |
| * | | | | OTG: Add/update javadoc; rename methods, exceptions | Nikita Mikhailov | 2016-04-14 | 1 | -17/+4 |
| * | | | | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 5 | -54/+56 |
| * | | | | OTG: Refactor persistent connections, naming | Nikita Mikhailov | 2016-04-14 | 4 | -82/+36 |
| * | | | | OTG: Add support for persistent usb connection | Nikita Mikhailov | 2016-04-14 | 3 | -72/+68 |
| * | | | | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 2 | -8/+53 |
| * | | | | OTG: Rename 'javacard' package, methods, remove JavacardInterface | Nikita Mikhailov | 2016-04-14 | 5 | -55/+53 |
| * | | | | OTG: Usb device manager fixes | Nikita Mikhailov | 2016-04-14 | 1 | -3/+9 |
| * | | | | OTG: Add usb device manager prototype | Nikita Mikhailov | 2016-04-14 | 1 | -28/+68 |
| * | | | | OTG: update methods | Nikita Mikhailov | 2016-04-14 | 5 | -623/+51 |
| |/ / / |
|
| * | | | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 2 | -118/+177 |
| * | | | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 2 | -10/+108 |
| |\ \ \ |
|
| | * | | | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 2 | -10/+108 |
| * | | | | Use cert pinning only if available | Dominik Schürmann | 2016-04-09 | 1 | -2/+2 |
| * | | | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 1 | -1/+1 |
| * | | | | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 20 | -578/+608 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 1 | -0/+3 |
| | |\ \ \ |
|
| | | * | | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 1 | -1/+2 |
| | | * | | | Fixes #1298 | Victor Hazali | 2016-03-30 | 1 | -0/+2 |
| | | |/ / |
|
| | * | | | Fix Unusable signing key not properly disabled, Issue #1468 | Durgesh | 2016-04-05 | 2 | -10/+0 |
| | * | | | Merge pull request #1808 from vhazali/warn-when-stripping-master-key | Vincent | 2016-04-04 | 1 | -5/+28 |
| | |\ \ \ |
|
