aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-2110-52/+212
|\
| * Merge pull request #1209 from adithyaphilip/qr-resultDominik Schürmann2015-04-211-12/+11
| |\
| | * added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| |/
| * Merge pull request #1210 from josecastillo/developmentVincent2015-04-211-3/+34
| |\
| | * Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
| | * Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33
| |/
| * Merge pull request #1207 from adithyaphilip/register-keyserver-urlsDominik Schürmann2015-04-208-37/+167
| |\
| | * support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-208-37/+167
| |/
* / Cleanup in HkpKeyserverDominik Schürmann2015-04-201-4/+3
|/
* Format KeyListFragmentDominik Schürmann2015-04-181-10/+9
* Temporarily fix devices without nfcDominik Schürmann2015-04-181-0/+6
* Graphic stuffDominik Schürmann2015-04-173-213/+134
* Use https for zxing libDominik Schürmann2015-04-171-1/+1
* Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
* More cleanupDominik Schürmann2015-04-159-324/+28
* Fix YubiKey naming, cleanupDominik Schürmann2015-04-1511-67/+59
* Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
* Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
* Merge pull request #1200 from josecastillo/developmentDominik Schürmann2015-04-151-19/+29
|\
| * Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
| * Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
* | Contribution infoDominik Schürmann2015-04-141-1/+1
* | Contribution infoDominik Schürmann2015-04-141-1/+1
* | Remove unused includes in settings.gradleDominik Schürmann2015-04-141-2/+0
|/
* Update libsDominik Schürmann2015-04-141-6/+6
* Pull from transifexDominik Schürmann2015-04-14110-1110/+1555
* Update html-textview, fix buildDominik Schürmann2015-04-141-2/+2
* Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
* Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
* Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-133-39/+119
|\
| * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-083-12/+25
| * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
* | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-137-100/+325
* | Clearer var namingDominik Schürmann2015-04-121-8/+8
* | More simplifications to PassphraseCacheServiceDominik Schürmann2015-04-121-27/+21
* | Simplify PassphraseCacheServiceDominik Schürmann2015-04-121-16/+12
* | Remove html-textview reference from settings.gradleDominik Schürmann2015-04-121-1/+0
* | Switch to html-textview from JCenterDominik Schürmann2015-04-123-6/+2
* | Update api libDominik Schürmann2015-04-101-0/+0
* | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-104-24/+69
* | Remove unused AlgorithmNamesDominik Schürmann2015-04-101-93/+0
* | Add license headersDominik Schürmann2015-04-103-0/+51
* | Externalize Parcelable cachingDominik Schürmann2015-04-102-59/+106
* | Fix signing subkey selection in remote serviceDominik Schürmann2015-04-072-20/+52
* | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify wh...Dominik Schürmann2015-04-042-6/+7
* | fix PgpEncryptDecryptTest for CryptoInputParcelVincent Breitmoser2015-04-011-26/+22
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-0115-276/+150
* | Prepare decrypt UI for input parcelDominik Schürmann2015-03-313-129/+79
* | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7