Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 2 | -4/+3 | |
* | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
* | | | | | | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 1 | -2/+18 | |
* | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -9/+11 | |
|\| | | | | | | | ||||||
| * | | | | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -9/+11 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -1/+1 | |
* | | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 2 | -14/+2 | |
* | | | | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -1/+1 | |
* | | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -2/+7 | |
* | | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 4 | -5/+5 | |
|\| | | | | | | ||||||
| * | | | | | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 4 | -16/+16 | |
* | | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 3 | -11/+26 | |
* | | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 | |
* | | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+3 | |
* | | | | | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -5/+6 | |
* | | | | | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+2 | |
* | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 5 | -12/+18 | |
|\| | | | | | | ||||||
| * | | | | | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 5 | -12/+18 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 5 | -40/+22 | |
* | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 4 | -16/+15 | |
* | | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 5 | -26/+107 | |
* | | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 2 | -14/+4 | |
|/ / / / / | ||||||
* | | | | | Add missing license headers | Dominik Schürmann | 2015-03-15 | 6 | -0/+102 | |
* | | | | | Fix for Issue #1115 | Manoj Khanna | 2015-03-13 | 1 | -1/+2 | |
* | | | | | added contact sync at end of CertifyOperation | Adithya Abraham Philip | 2015-03-11 | 1 | -0/+4 | |
| |_|_|/ |/| | | | ||||||
* | | | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 2 | -10/+18 | |
* | | | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 | |
* | | | | Remove advanced preferences, move compression as menu item in encrypt activit... | Dominik Schürmann | 2015-03-05 | 1 | -8/+0 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ... | Dominik Schürmann | 2015-03-04 | 1 | -0/+7 | |
|\ \ \ | ||||||
| * | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 | |
| | |/ | |/| | ||||||
* | | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 | |
* | | | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 | |
|/ / | ||||||
* | | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -0/+9 | |
|\ \ | ||||||
| * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -0/+9 | |
* | | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 | |
* | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 10 | -131/+346 | |
* | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 | |
* | | | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 5 | -198/+96 | |
|\ \ \ | ||||||
| * | | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 5 | -198/+96 | |
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 4 | -3/+62 | |
|\ \ \ \ | ||||||
| * | | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 2 | -0/+12 | |
| * | | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 3 | -3/+50 | |
* | | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 7 | -7/+207 | |
|\| | | | | ||||||
| * | | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 4 | -6/+5 | |
| * | | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 5 | -1/+170 | |
| * | | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+2 | |
| |/ / / | ||||||
| * | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 | |
| * | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+12 | |
| * | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+2 |