aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24224-8054/+10116
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
* | | | | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
* | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09225-8050/+10228
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-405/+423
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
| |\ \ \ \ \ \ \
| | * | | | | | | changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| | | |_|_|_|_|/ | | |/| | | | |
| * / | | | | | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-272-12/+37
| |/ / / / / /
| * | | | | | Modify break as return.iseki2015-03-261-1/+1
| * | | | | | Add brackets for if-else constructs and externalize the procedure as showMult...iseki2015-03-261-26/+33
| * | | | | | Add a loop for multiple key export.iseki2015-03-251-13/+68
| | |_|_|_|/ | |/| | | |
| * | | | | 3.2beta3Dominik Schürmann2015-03-232-3/+3
| * | | | | translation fixesDominik Schürmann2015-03-238-113/+93
| * | | | | Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| * | | | | Pull from transifexDominik Schürmann2015-03-23113-209/+8859
| * | | | | Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| * | | | | Merge pull request #1165 from kentnek/dev-yubikey-nullDominik Schürmann2015-03-231-5/+11
| |\ \ \ \ \
| | * | | | | Fixed #1152:Kent2015-03-201-5/+11
| * | | | | | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2325-122/+691
| |\ \ \ \ \ \
| | * | | | | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2321-334/+611
| | * | | | | | introduced multi-threadingAdithya Abraham Philip2015-03-236-35/+327
| * | | | | | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| * | | | | | | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fixed issue where setting a passphrase to null later causes a NullPointerExce...JesperBK2015-03-231-1/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Markdown commentsDominik Schürmann2015-03-235-5/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 17:42:20 +0000