aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2432-186/+753
| |\ \ \ \
| * | | | | further improve yubikey error handlingVincent Breitmoser2015-03-234-24/+77
| * | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
| * | | | | 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-223-5/+49
| * | | | | | finish ui flow for yubikey importVincent Breitmoser2015-03-227-198/+330
| * | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-225-30/+21
| * | | | | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-11/+102
| * | | | | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-226-158/+259
| * | | | | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-216-67/+142
| * | | | | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-215-21/+278
| * | | | | | first steps toward yubikey activityVincent Breitmoser2015-03-2128-451/+589
| * | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2125-193/+200
| |\ \ \ \ \ \
| * | | | | | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
| * | | | | | | add edit key unit test for no-opVincent Breitmoser2015-03-203-0/+10
| * | | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-204-5/+15
| * | | | | | | 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-2047-603/+996
| |\ \ \ \ \ \ \
| * | | | | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-2016-247/+294
| * | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
| * | | | | | | | yubikey certifications!Vincent Breitmoser2015-03-1814-239/+474
| * | | | | | | | generalize nfc crypto input structureVincent Breitmoser2015-03-1815-215/+857
| * | | | | | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
* | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-0933-182/+864
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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-271-12/+36
| |/ / / / / /
| * | | | | | 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
| | |_|_|_|/ | |/| | | |
| * | | | | Pull from transifexDominik Schürmann2015-03-233-10/+10
| * | | | | 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-2322-122/+681
| |\ \ \ \ \ \
| | * | | | | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2320-334/+608
| | * | | | | | introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
| * | | | | | | 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
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ / / / | |/| | | |
* | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-393/+400
* | | | | | even more linked id ui workVincent Breitmoser2015-03-295-28/+29
* | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-9/+38
* | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 06:16:46 +0000