aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2627-183/+802
|\
| * Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-262-12/+13
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-2510-41/+19
| * Set different titles when changing in nav drawerDominik Schürmann2015-04-251-6/+10
| * Fix empty screen when clicking on encrypt in details viewDominik Schürmann2015-04-251-5/+2
| * Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-251-20/+154
| |\
| | * Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-241-44/+85
| | * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-241-25/+118
| * | fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
| * | revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
| |/
| * Fixed Snackbar behind layoutManoj Khanna2015-04-222-13/+13
| * keyserver verification on additionAdithya Abraham Philip2015-04-222-1/+379
| * corrected possible null pointerAdithya Abraham Philip2015-04-221-1/+1
| * Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-218-52/+192
| |\
| | * added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| | * 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
| | * support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-206-37/+147
| * | 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
* | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-257-17/+53
* | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-6/+13
* | fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
* | revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
* | don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
* | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2499-3465/+4785
|\|
| * 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-1510-62/+54
| * Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| * Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
| * 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
| * 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-132-39/+118
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-082-12/+24
| | * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
| * | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-136-100/+321
| * | 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
| * | 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