aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-1555-468/+1371
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | concurrency and continuity fixes for verification backstack handlingVincent Breitmoser2015-03-101-14/+26
| * | | | | | | | | | support backstack for verificationVincent Breitmoser2015-03-091-12/+26
| * | | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-093-69/+192
| * | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-092-7/+15
| * | | | | | | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
| * | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-098-110/+267
| * | | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-084-21/+80
| * | | | | | | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
| * | | | | | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-11/+11
| * | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0832-540/+1154
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | work on certification stepVincent Breitmoser2015-03-081-6/+90
| * | | | | | | | | | | finish after linked id creationVincent Breitmoser2015-03-061-12/+1
| * | | | | | | | | | | use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
| * | | | | | | | | | | use final fragment superclass for dnsVincent Breitmoser2015-03-062-214/+19
| * | | | | | | | | | | extract linked id create final fragment superclassVincent Breitmoser2015-03-062-221/+275
| * | | | | | | | | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-065-34/+42
| * | | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-064-231/+310
| * | | | | | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-059-25/+170
| * | | | | | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-0510-106/+150
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0538-451/+780
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | small fixes to the matcherVincent Breitmoser2015-03-051-5/+2
| * | | | | | | | | | | | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
| * | | | | | | | | | | | do a TON of UI workVincent Breitmoser2015-03-0522-246/+456
| * | | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0419-226/+408
| * | | | | | | | | | | | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
| * | | | | | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| * | | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
| * | | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-027-279/+323
| |\ \ \ \ \ \ \ \ \ \ \ \