aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-226-31/+24
* improve status reporting in yubikey dialogueVincent Breitmoser2015-03-223-14/+114
* move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-229-228/+376
* split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2120-88/+264
* work on ad-hoc yubikey import supportVincent Breitmoser2015-03-217-37/+365
* first steps toward yubikey activityVincent Breitmoser2015-03-2130-468/+689
* Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2127-198/+215
|\
| * Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-03-2126-203/+184
| |\
| | * Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2126-203/+184
| |/|
| | * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-202-9/+24
| | * Reworked Notify classManoj Khanna2015-03-2025-197/+153
| * | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-201-2/+17
| |\
| | * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| | |\
| | | * - Added footer so that the Floating Action Button won't block the last few it...Kent2015-03-201-2/+17
| * | | Update api libDominik Schürmann2015-03-201-0/+0
| |/ /
| * | Update OpenPGP API libDominik Schürmann2015-03-201-0/+0
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-202-2/+18
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
* | | add edit key unit test for no-opVincent Breitmoser2015-03-205-0/+17
* | | fix unit tests (for real)Vincent Breitmoser2015-03-207-20/+39
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-2010-66/+56
* | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
* | | fix unit tests (syntax)Vincent Breitmoser2015-03-204-21/+33
* | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2086-819/+1217
|\| |
| * | Merge pull request #1164 from kentnek/dev-nfc-advanced-viewDominik Schürmann2015-03-209-158/+275
| |\ \ | | |/ | |/|
| | * Updated GNU headerKent2015-03-201-1/+2
| | * Removed create and added GPLv3 headerKent2015-03-201-4/+17
| | * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-209-158/+261
| |/
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-193-60/+81
| |\
| | * Merge pull request #1158 from manojkhannakm/developmentDominik Schürmann2015-03-193-60/+81
| | |\
| | | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-192-55/+51
| | |/
| * / Manage my keys wizardDominik Schürmann2015-03-1935-430/+455
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| * Fix headerDominik Schürmann2015-03-191-1/+2
| * Fix tests for Passphrase classDominik Schürmann2015-03-1910-45/+71
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-17/+27
| |\
| | * Merge pull request #1160 from jellysheep/cloudsearch-show-main-emailDominik Schürmann2015-03-181-1/+14
| | |\
| | | * Added comments for server result sorting in key searchMax Mertens2015-03-181-0/+6
| | | * Show HKP server results first in key cloud search. Fixes #1066Max Mertens2015-03-181-1/+8
| | |/
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
* | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-2017-248/+296
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
* | | yubikey certifications!Vincent Breitmoser2015-03-1815-240/+475
* | | generalize nfc crypto input structureVincent Breitmoser2015-03-1818-235/+883