Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 4 | -6/+51 |
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 9 | -221/+396 |
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 6 | -31/+24 |
* | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 3 | -14/+114 |
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 9 | -228/+376 |
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 17 | -86/+230 |
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 7 | -37/+365 |
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 30 | -468/+689 |
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 26 | -198/+215 |
|\| | |||||
| * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ... | Dominik Schürmann | 2015-03-21 | 25 | -203/+184 |
| |\ | |||||
| | * | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | * | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 2 | -9/+24 |
| | * | 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 | 4 | -0/+11 |
* | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 5 | -7/+19 |
* | | | 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 | 77 | -774/+1149 |
|\| | | |||||
| * | | 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 | 9 | -158/+261 |
| |/ | |||||
| * | 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 |
| |\ | |||||
| | * | Fix for Issue #1114 | Manoj Khanna | 2015-03-19 | 1 | -5/+30 |
| | * | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 2 | -55/+51 |
| * | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 35 | -430/+455 |
| |/ | |||||
| * | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 |
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 1 | -0/+4 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
| |\ | |||||
| | * | Added comments for server result sorting in key search | Max Mertens | 2015-03-18 | 1 | -0/+6 |
| | * | Show HKP server results first in key cloud search. Fixes #1066 | Max Mertens | 2015-03-18 | 1 | -1/+8 |
| * | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 34 | -140/+307 |
* | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 17 | -248/+296 |
* | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 |
* | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 15 | -240/+475 |
* | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 17 | -230/+878 |
* | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 |
| |/ |/| | |||||
* | | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 |
|/ | |||||
* | Manifest cleanup | Dominik Schürmann | 2015-03-17 | 1 | -9/+12 |