aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2654-238/+1111
|\
| * Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2616-16/+162
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-2513-52/+30
| * Update in-app contributor listDominik Schürmann2015-04-251-3/+22
| * 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
| * Update lib section in aboutDominik Schürmann2015-04-251-2/+2
| * Remove old navigation drawer dependencyDominik Schürmann2015-04-253-12/+1
| * Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-254-20/+192
| |\
| | * Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-242-46/+89
| | * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-244-25/+154
| * | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| * | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-228-30/+449
| |\
| | * Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| | * keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
| * | Update changelogDominik Schürmann2015-04-221-6/+8
| |/
| * 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-2110-52/+212
| |\
| | * 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-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
* | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-2511-33/+65
* | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-255-10/+27
* | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
* | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
* | 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-246-80/+38
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24236-4752/+6846
|\|
| * 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
| * 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
| * 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