aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2414-274/+234
|\
| * Externalize Parcelable cachingDominik Schürmann2015-04-101-59/+11
| * Fix signing subkey selection in remote serviceDominik Schürmann2015-04-071-0/+1
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-012-53/+7
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-305-76/+50
| * pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-302-4/+3
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-2/+5
| |\
| * | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+18
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-9/+11
| |\ \
| * | | finish ui flow for yubikey importVincent Breitmoser2015-03-221-1/+1
| * | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-222-14/+2
| * | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-1/+1
| * | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-2/+7
| * | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-214-5/+5
| |\ \ \
| * | | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-213-11/+26
| * | | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| * | | | fix unit tests (for real)Vincent Breitmoser2015-03-201-1/+3
| * | | | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-5/+6
| * | | | fix unit tests (syntax)Vincent Breitmoser2015-03-201-2/+2
| * | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-205-12/+18
| |\ \ \ \
| * | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-205-40/+22
| * | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-194-16/+15
| * | | | | yubikey certifications!Vincent Breitmoser2015-03-185-26/+107
| * | | | | generalize nfc crypto input structureVincent Breitmoser2015-03-182-14/+4
* | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-092-11/+16
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| | |_|_|/ | |/| | |
| * | | | introduced multi-threadingAdithya Abraham Philip2015-03-231-9/+11
| | |_|/ | |/| |
* | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-2/+8
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-249-28/+34
|\| | |
| * | | Reworked Notify classManoj Khanna2015-03-204-16/+16
| | |/ | |/|
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-195-12/+18
| |/
* | support github resource (pa)Vincent Breitmoser2015-03-241-0/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-156-1/+108
|\|
| * Add missing license headersDominik Schürmann2015-03-156-0/+102
| * Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
| * added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-083-18/+20
|\|
| * add support for certification of user attributesVincent Breitmoser2015-03-082-10/+18
| * Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
| * Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-051-8/+0
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-6/+69
|\|
| * Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-041-0/+7
| |\
| | * added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| * | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| * | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
| |/
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-14/+0
|\|
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0215-317/+686
|\|
| * Merge keybase-proof branchDominik Schürmann2015-02-271-0/+9
| |\
| | * Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 18:34:05 +0000