aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-7866/+9359
| | |\ \ \ \ \
| | * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | * | | | | | even more linked id ui workVincent Breitmoser2015-03-293-6/+9
| | * | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-30/+27
| | * | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2616-0/+0
| | * | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2634-126/+115
| | * | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
| | * | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2434-176/+222
| | |\ \ \ \ \ \
| | * | | | | | | support github resource (re)Vincent Breitmoser2015-03-244-1/+331
| | * | | | | | | support github resource (pa)Vincent Breitmoser2015-03-242-0/+3
| | * | | | | | | work on certification uiVincent Breitmoser2015-03-1514-33/+71
| | * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15101-1504/+1475
| | |\ \ \ \ \ \ \
| | * | | | | | | | work on second step of identity creationVincent Breitmoser2015-03-135-204/+161
| | * | | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-138-85/+102
| | * | | | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| | * | | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-134-3/+4
| | * | | | | | | | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
| | * | | | | | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-122-221/+77
| | * | | | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+1
| | * | | | | | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-21/+27
| | * | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1040-64/+200
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | add expand item to linked id listVincent Breitmoser2015-03-103-1/+36
| | * | | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
| | * | | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1082-474/+507
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-092-11/+102
| | * | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-52/+0
| | * | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+8
| | * | | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | * | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0820-75/+110
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | work on certification stepVincent Breitmoser2015-03-081-1/+10
| | * | | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-064-6/+100
| | * | | | | | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-053-80/+8
| | * | | | | | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-052-6/+6
| | * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05486-950/+370
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | do a TON of UI workVincent Breitmoser2015-03-055-0/+216
| | * | | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-042-1/+30
| | * | | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-022-1/+7
| | * | | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-024-9/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| | * | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02696-3375/+8010
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | small language fixVincent Breitmoser2015-01-161-2/+2
| | * | | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-162-5/+3
| | * | | | | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-159-29/+29
| | * | | | | | | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-144-13/+232
| | * | | | | | | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
| | * | | | | | | | | | | | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
| | * | | | | | | | | | | | | | certification of the first linked identity packet!Vincent Breitmoser2015-01-131-0/+1
| | * | | | | | | | | | | | | | add back button to wizard fragmentsVincent Breitmoser2015-01-136-12/+24
| | * | | | | | | | | | | | | | some work on twitter resourceVincent Breitmoser2015-01-136-14/+627