aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Updated fix for Issue #1116Manoj Khanna2015-03-113-46/+104
| * | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keysDominik Schürmann2015-03-123-14/+53
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
| | * | | | corrected linked system contact display nameAdithya Abraham Philip2015-03-112-14/+49
| | |/ / /
| * / / / change user_id primary key in database, use keyring rather than unified query...Vincent Breitmoser2015-03-113-14/+26
| |/ / /
| * | | make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
| * | | Disable maybe methods in ImportKeysListEntry for nowDominik Schürmann2015-03-101-2/+3
| * | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
| * | | API 7Dominik Schürmann2015-03-108-204/+555
* | | | show certificates for secret keys differentlyVincent Breitmoser2015-03-144-28/+46
* | | | work on second step of identity creationVincent Breitmoser2015-03-133-23/+25
* | | | don't filter tweet intentVincent Breitmoser2015-03-131-31/+6
* | | | improve error handling in LinkedIdViewFragment, disable unknown identity type...Vincent Breitmoser2015-03-132-8/+27
* | | | verification takes a second at leastVincent Breitmoser2015-03-131-1/+11
* | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-7/+4
* | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-1317-103/+38
* | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
* | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
* | | | small fix for CreateFinalFragmentVincent Breitmoser2015-03-122-5/+2
* | | | twitter Step3 -> Step2Vincent Breitmoser2015-03-122-12/+5
* | | | ditch custom text step for twitterVincent Breitmoser2015-03-123-174/+18
* | | | finish implementing twitter resourceVincent Breitmoser2015-03-128-108/+214
* | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-27/+50
* | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-107-13/+548
|\| | |
| * | | RippleDominik Schürmann2015-03-101-3/+1
| * | | Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-101-3/+70
| |\ \ \
| | * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+19
| | * | | Make create key wizard step-by-stepDominik Schürmann2015-03-105-35/+312
| | * | | cleaned up code, added commentsAdithya Abraham Philip2015-03-102-9/+16
| | * | | added contact linkingAdithya Abraham Philip2015-03-102-9/+80
| | * | | added cardAdithya Abraham Philip2015-03-101-0/+18
| | | |/ | | |/|
| * | | Merge pull request #1121 from adithyaphilip/rawcontact-deletionDominik Schürmann2015-03-101-3/+47
| |\ \ \
| | * | | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
| * | | | Add additional email addresses in create keyDominik Schürmann2015-03-105-6/+433
| |/ / /
* | | | add expand item to linked id listVincent Breitmoser2015-03-102-4/+43
* | | | filter out unknown linked idsVincent Breitmoser2015-03-103-22/+116
* | | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
* | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-46/+64
* | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1024-432/+786
|\| | |
| * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+19
| * | | Make create key wizard step-by-stepDominik Schürmann2015-03-095-35/+312
| |/ /
| * | Some fixes for delete after encryptionDominik Schürmann2015-03-091-22/+27
| * | Fix ascii armor in encrypt activityDominik Schürmann2015-03-091-3/+2
| * | Fix compression check in activitiesDominik Schürmann2015-03-093-4/+3
| |/
| * API: If signature key is known return pi to show keyDominik Schürmann2015-03-091-73/+72
| * Fix colors for remote activityDominik Schürmann2015-03-091-1/+1
| * Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-094-54/+53
| |\
| | * Implemented NameEditTextchipset952015-03-094-96/+10