| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 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 |
* | OTG: Usb device manager fixes | Nikita Mikhailov | 2016-04-14 | 5 | -93/+74 |
* | OTG: Add usb device manager prototype | Nikita Mikhailov | 2016-04-14 | 5 | -28/+219 |
* | OTG: update methods | Nikita Mikhailov | 2016-04-14 | 8 | -707/+308 |
* | OTG: port old primitives from otg_alt branch | Nikita Mikhailov | 2016-04-14 | 11 | -0/+995 |
* | Fix string | Dominik Schürmann | 2016-04-13 | 1 | -1/+1 |
* | Merge branch 'backup-code' | Dominik Schürmann | 2016-04-12 | 8 | -187/+1605 |
|\ |
|
| * | Fix in-app help for backup codes | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 |
| * | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 7 | -186/+1604 |
* | | Fix strings | Dominik Schürmann | 2016-04-12 | 1 | -3/+3 |
|/ |
|
* | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 4 | -10/+136 |
|\ |
|
| * | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 4 | -10/+136 |
* | | Add missing keyholder string param | Nikita Mikhailov | 2016-04-11 | 1 | -1/+1 |
* | | Use cert pinning only if available | Dominik Schürmann | 2016-04-09 | 7 | -41/+36 |
* | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 5 | -29/+41 |
* | | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 2 | -10/+10 |
* | | cleaning | Michal Kepkowski | 2016-04-06 | 2 | -8/+6 |
* | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 48 | -863/+979 |
|\ \ |
|
| * \ | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 2 | -0/+4 |
| |\ \ |
|
| | * | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 2 | -1/+3 |
| | * | | 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 | 2 | -5/+31 |
| |\ \ |
|
| | * | | setTitle now uses resource id directly | Victor Hazali | 2016-04-01 | 1 | -1/+1 |
| | * | | Corrected warning message | Victor Hazali | 2016-04-01 | 1 | -1/+1 |
| | * | | Corrected capitalisation of subkey | Victor Hazali | 2016-03-30 | 1 | -2/+2 |
| | * | | Refactored switch statements to use constants | Victor Hazali | 2016-03-30 | 1 | -5/+9 |
| | * | | Extracted method | Victor Hazali | 2016-03-30 | 1 | -16/+20 |
| | * | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp... | Victor Hazali | 2016-03-30 | 2 | -1/+19 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Alert for Stripping Subkeys. | tdjogi010@gmail.com | 2016-03-02 | 2 | -1/+19 |
| * | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions | Vincent | 2016-04-04 | 14 | -485/+362 |
| |\ \ \ |
|
| | * | | | Redesigned subkey creation dialog and changed default key type created to RSA... | Alex Fong | 2016-04-01 | 14 | -485/+362 |
| * | | | | Fix Display Key in UploadKeyActivity, Issue #506 | Durgesh | 2016-03-31 | 8 | -23/+45 |
| * | | | | Display Key moved to Fragment | Durgesh | 2016-03-29 | 5 | -173/+233 |
| | |/ /
| |/| | |
|
| * | | | change sync interval on change in code | Adithya Abraham Philip | 2016-03-24 | 4 | -12/+63 |
| * | | | Merge pull request #1785 from advaita13/wifi-only-fix | Vincent | 2016-03-24 | 9 | -22/+119 |
| |\ \ \ |
|
| | * | | | Final commit | Advaita | 2016-03-23 | 9 | -22/+119 |
| * | | | | Merge pull request #1782 from fiaxh/share_key_mime | Dominik Schürmann | 2016-03-24 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | Set MIME application/pgp-keys when sending a key | fiaxh | 2016-03-14 | 1 | -1/+1 |
| | |/ / / |
|