aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Use markdown for in-app helpDominik Schürmann2015-03-2381-7652/+522
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | further improve yubikey error handlingVincent Breitmoser2015-03-235-24/+78
* | | | | | | | | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-232-5/+9
* | | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/ / / / / / / / / /
* | | | | | | | | | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
* | | | | | | | | | | enable nfc in import dialog as wellVincent Breitmoser2015-03-224-6/+51
* | | | | | | | | | | finish ui flow for yubikey importVincent Breitmoser2015-03-229-221/+396
* | | | | | | | | | | 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-2117-86/+230
* | | | | | | | | | | 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-2126-198/+215
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2125-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-2024-197/+153
| * | | | | | | | | | | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/ / / / / / / / / /
| * | | | | | | | | | 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
| | |/ / / / / / / / /
| * | | | | | | | | | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| * | | | | | | | | | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-201-2/+18
* | | | | | | | | | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
* | | | | | | | | | | add edit key unit test for no-opVincent Breitmoser2015-03-204-0/+11
* | | | | | | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-205-7/+19
* | | | | | | | | | | fix more unit tests (syntax)Vincent Breitmoser2015-03-206-17/+17
* | | | | | | | | | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
* | | | | | | | | | | fix unit tests (syntax)Vincent Breitmoser2015-03-203-3/+13
* | | | | | | | | | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
* | | | | | | | | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2077-774/+1149
|\| | | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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 tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| * | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-17/+27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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-1817-230/+878