aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2916-8/+1779
|\
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-117-111/+205
| |\
| * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| * | small ui nicetiesVincent Breitmoser2015-04-271-1/+1
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-2/+14
| * | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-269-19/+220
| |\ \ \
| * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-253-10/+5
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-4/+10
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| * | | | revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2412-99/+406
| |\ \ \ \
| * | | | | minor ui and wording changesVincent Breitmoser2015-04-091-4/+16
| * | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| * | | | | even more linked id ui workVincent Breitmoser2015-03-292-6/+8
| * | | | | more (subtle) ui workVincent Breitmoser2015-03-261-22/+19
| * | | | | some linked id ui fine tuningVincent Breitmoser2015-03-269-125/+70
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-246-147/+165
| |\ \ \ \ \
| * | | | | | support github resource (re)Vincent Breitmoser2015-03-243-0/+321
| * | | | | | work on certification uiVincent Breitmoser2015-03-152-27/+39
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-78/+73
| |\ \ \ \ \ \
| * | | | | | | work on second step of identity creationVincent Breitmoser2015-03-134-190/+146
| * | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-137-65/+84
| * | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-133-3/+3
| * | | | | | | 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-1033-59/+193
| |\ \ \ \ \ \ \
| * | | | | | | | add expand item to linked id listVincent Breitmoser2015-03-101-1/+21
| * | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
| * | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1025-446/+446
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-084-21/+55
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | work on certification stepVincent Breitmoser2015-03-081-1/+10
| * | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-062-6/+86
| * | | | | | | | | | 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-0553-178/+276
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | do a TON of UI workVincent Breitmoser2015-03-054-0/+212
| * | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-7/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| * | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0287-1517/+2232
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-161-4/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 04:53:27 +0000