Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 3 | -10/+6 |
* | Remove backward compat in CertifyKeyFragment | Dominik Schürmann | 2015-03-25 | 1 | -17/+1 |
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 32 | -186/+753 |
|\ | |||||
| * | 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 |
| | |/ / | |/| | | |||||
* | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 4 | -24/+77 |
* | | | | 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 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | use top line in snackbar for status indication | 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 |
|\| | | |||||
| * | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ... | Dominik Schürmann | 2015-03-21 | 24 | -198/+169 |
| |\ \ | |||||
| | * | | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | * | | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 |
| | * | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 24 | -197/+153 |
| * | | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #1163 from kentnek/dev-list-footer | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 |
| |\ \ | |||||
| | * | | - Added footer so that the Floating Action Button won't block the last few it... | Kent | 2015-03-20 | 1 | -2/+17 |
| | |/ | |||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 |
| * | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 1 | -2/+18 |
* | | | 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 |
|\| | | |||||
| * | | Updated GNU header | Kent | 2015-03-20 | 1 | -1/+2 |
| * | | Removed create and added GPLv3 header | Kent | 2015-03-20 | 1 | -4/+17 |
| * | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 3 | -154/+240 |
| |/ | |||||
| * | Remove on click on icon | Dominik Schürmann | 2015-03-19 | 1 | -0/+2 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 |
| |\ |