aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-254-20/+192
|\ | | | | Switch to MaterialDrawer library
| * 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 ↵Dominik Schürmann2015-04-228-30/+449
|\ | | | | | | development
| * Merge pull request #1218 from manojkhannakm/developmentDominik Schürmann2015-04-225-29/+29
| |\ | | | | | | Fixed Snackbar behind layout
| | * Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| |/ | | | | | | Surrounded string with quotes
| * Merge pull request #1214 from adithyaphilip/keyserver-verificationDominik Schürmann2015-04-224-1/+420
| |\ | | | | | | Verifying Newly Added Keyservers
| | * keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
| |/
* / Update changelogDominik Schürmann2015-04-221-6/+8
|/
* Merge pull request #1212 from adithyaphilip/qr-resultDominik Schürmann2015-04-221-1/+1
|\ | | | | Corrected possible null pointer with key import
| * 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 ↵Dominik Schürmann2015-04-2110-52/+212
|\ | | | | | | development
| * Merge pull request #1209 from adithyaphilip/qr-resultDominik Schürmann2015-04-211-12/+11
| |\ | | | | | | Make Logs not Toasts - Fixes Issue #1198
| | * 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
| |\ | | | | | | Maintain client-side state for PIN verification operations
| | * 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 documentation
| | * 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
|\ | | | | Fix for NFC signing operations: move PIN verify inside sign/decrypt operation and set correct mode.
| * 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
|\ | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| * 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:46:08 +0000