Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 | |
| * | | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 | |
| * | | | | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 3 | -5/+49 | |
| * | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 7 | -198/+330 | |
| * | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 5 | -30/+21 | |
| * | | | | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -11/+102 | |
| * | | | | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 6 | -158/+259 | |
| * | | | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 6 | -67/+142 | |
| * | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 5 | -21/+278 | |
| * | | | | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 28 | -451/+589 | |
| * | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 25 | -193/+200 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 7 | -36/+110 | |
| * | | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 3 | -0/+10 | |
| * | | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 4 | -5/+15 | |
| * | | | | | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 6 | -17/+17 | |
| * | | | | | | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 | |
| * | | | | | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 3 | -3/+13 | |
| * | | | | | | | re-inline cryptoInput variable | Vincent Breitmoser | 2015-03-20 | 1 | -32/+34 | |
| * | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 47 | -603/+996 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 16 | -247/+294 | |
| * | | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 | |
| * | | | | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 14 | -239/+474 | |
| * | | | | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 16 | -230/+872 | |
| * | | | | | | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 | |
* | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 33 | -182/+864 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 4 | -392/+400 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * / | | | | | | -Fixed a situation where additional emails could be duplicated when creating ... | Daniel Ramos | 2015-03-27 | 1 | -12/+36 | |
| |/ / / / / / | ||||||
| * | | | | | | Modify break as return. | iseki | 2015-03-26 | 1 | -1/+1 | |
| * | | | | | | Add brackets for if-else constructs and externalize the procedure as showMult... | iseki | 2015-03-26 | 1 | -26/+33 | |
| * | | | | | | Add a loop for multiple key export. | iseki | 2015-03-25 | 1 | -13/+68 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Pull from transifex | Dominik Schürmann | 2015-03-23 | 3 | -10/+10 | |
| * | | | | | Merge pull request #1165 from kentnek/dev-yubikey-null | Dominik Schürmann | 2015-03-23 | 1 | -5/+11 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 | |
| * | | | | | | Merge pull request #1166 from adithyaphilip/multi-threaded | Dominik Schürmann | 2015-03-23 | 22 | -122/+681 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 20 | -334/+608 | |
| | * | | | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 4 | -35/+320 | |
| * | | | | | | | Fix passphrase cache not clearing all passphrases | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 | |
| * | | | | | | | Merge pull request #1174 from Jesperbk/development | Dominik Schürmann | 2015-03-23 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fixed issue where setting a passphrase to null later causes a NullPointerExce... | JesperBK | 2015-03-23 | 1 | -1/+3 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-23 | 1 | -14/+23 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 3 | -17/+41 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 4 | -393/+400 | |
* | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 5 | -28/+29 | |
* | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 2 | -9/+38 | |
* | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -0/+2 | |
* | | | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 5 | -27/+34 | |
* | | | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 6 | -25/+18 |