Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 7 | -20/+39 |
* | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 10 | -66/+56 |
* | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 |
* | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 4 | -21/+33 |
* | 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 | 86 | -819/+1217 |
|\ | |||||
| * | Merge pull request #1164 from kentnek/dev-nfc-advanced-view | Dominik Schürmann | 2015-03-20 | 9 | -158/+275 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | Merge pull request #1158 from manojkhannakm/development | 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 header | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 10 | -45/+71 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
| |\ | |||||
| | * | Merge pull request #1160 from jellysheep/cloudsearch-show-main-email | Dominik Schürmann | 2015-03-18 | 1 | -1/+14 |
| | |\ | |||||
| | | * | 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 | 18 | -235/+883 |
* | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 |
| |/ |/| | |||||
* | | Merge pull request #1155 from adithyaphilip/development | Dominik Schürmann | 2015-03-17 | 1 | -16/+13 |
|\ \ | |/ |/| | |||||
| * | 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 |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 |
|\ | |||||
| * | Merge pull request #1154 from adithyaphilip/development | Dominik Schürmann | 2015-03-16 | 1 | -6/+2 |
| |\ | |||||
| | * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 |
| |/ | |||||
* / | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 |
|/ | |||||
* | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 |
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 13 | -33/+133 |
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 7 | -11/+44 |
* | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -2/+0 |
* | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -28/+5 |
* | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 |
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+53 |
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 26 | -148/+139 |
* | Update openpgp-api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 |
* | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 2 | -2/+37 |
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 |