Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 2 | -3/+4 | |
* | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 7 | -230/+391 | |
|/ / | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-04-22 | 8 | -30/+449 | |
|\ \ | ||||||
| * \ | Merge pull request #1218 from manojkhannakm/development | Dominik Schürmann | 2015-04-22 | 5 | -29/+29 | |
| |\ \ | ||||||
| | * | | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 5 | -29/+29 | |
| |/ / | ||||||
| * | | Merge pull request #1214 from adithyaphilip/keyserver-verification | Dominik Schürmann | 2015-04-22 | 4 | -1/+420 | |
| |\ \ | ||||||
| | * | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 4 | -1/+420 | |
| |/ / | ||||||
* / / | Update changelog | Dominik Schürmann | 2015-04-22 | 1 | -6/+8 | |
|/ / | ||||||
* | | Merge pull request #1212 from adithyaphilip/qr-result | Dominik Schürmann | 2015-04-22 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | corrected possible null pointer | Adithya Abraham Philip | 2015-04-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Simplify ImportKeysProxyActivity | Dominik Schürmann | 2015-04-21 | 1 | -29/+12 | |
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-04-21 | 10 | -52/+212 | |
|\ \ | ||||||
| * \ | Merge pull request #1209 from adithyaphilip/qr-result | Dominik Schürmann | 2015-04-21 | 1 | -12/+11 | |
| |\ \ | ||||||
| | * | | added log to QR code scan/import fail | Adithya Abraham Philip | 2015-04-21 | 1 | -12/+11 | |
| |/ / | ||||||
| * | | Merge pull request #1210 from josecastillo/development | Vincent | 2015-04-21 | 1 | -3/+34 | |
| |\ \ | ||||||
| | * | | Fix for initialization failure when card returns FCI in data field. | Joey Castillo | 2015-04-20 | 1 | -1/+1 | |
| | * | | Track state of PIN verification on smart card; only verify when needed. | Joey Castillo | 2015-04-20 | 1 | -2/+33 | |
| |/ / | ||||||
| * | | Merge pull request #1207 from adithyaphilip/register-keyserver-urls | Dominik Schürmann | 2015-04-20 | 8 | -37/+167 | |
| |\ \ | ||||||
| | * | | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 8 | -37/+167 | |
| |/ / | ||||||
* / / | Cleanup in HkpKeyserver | Dominik Schürmann | 2015-04-20 | 1 | -4/+3 | |
|/ / | ||||||
* | | Format KeyListFragment | Dominik Schürmann | 2015-04-18 | 1 | -10/+9 | |
* | | Temporarily fix devices without nfc | Dominik Schürmann | 2015-04-18 | 1 | -0/+6 | |
* | | Graphic stuff | Dominik Schürmann | 2015-04-17 | 3 | -213/+134 | |
* | | Use https for zxing lib | Dominik Schürmann | 2015-04-17 | 1 | -1/+1 | |
* | | Use portrait mode for qr code scanning | Dominik Schürmann | 2015-04-15 | 1 | -10/+8 | |
* | | More cleanup | Dominik Schürmann | 2015-04-15 | 9 | -324/+28 | |
* | | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 11 | -67/+59 | |
* | | Clean up NfcOperationActivity | Dominik Schürmann | 2015-04-15 | 1 | -8/+6 | |
* | | Reformat nfcVerifyPIN | Dominik Schürmann | 2015-04-15 | 1 | -6/+6 | |
* | | Merge pull request #1200 from josecastillo/development | Dominik Schürmann | 2015-04-15 | 1 | -19/+29 | |
|\ \ | ||||||
| * | | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 | |
| * | | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 | |
* | | | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 | |
* | | | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 | |
* | | | Remove unused includes in settings.gradle | Dominik Schürmann | 2015-04-14 | 1 | -2/+0 | |
|/ / | ||||||
* / | Update libs | Dominik Schürmann | 2015-04-14 | 1 | -6/+6 | |
|/ | ||||||
* | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 | |
* | Update html-textview, fix build | Dominik Schürmann | 2015-04-14 | 1 | -2/+2 | |
* | Reformat comment in PassphraseCacheService | Dominik Schürmann | 2015-04-13 | 1 | -4/+5 | |
* | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 | |
* | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 3 | -39/+119 | |
|\ | ||||||
| * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 3 | -12/+25 | |
| * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 2 | -38/+105 | |
* | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 7 | -100/+325 | |
* | | Clearer var naming | Dominik Schürmann | 2015-04-12 | 1 | -8/+8 | |
* | | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 | |
* | | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 | |
* | | Remove html-textview reference from settings.gradle | Dominik Schürmann | 2015-04-12 | 1 | -1/+0 | |
* | | Switch to html-textview from JCenter | Dominik Schürmann | 2015-04-12 | 3 | -6/+2 | |
* | | Update api lib | Dominik Schürmann | 2015-04-10 | 1 | -0/+0 |