Skip to content

Merge main into feature/setupFlowImprovements - #208

Merged
DKeatonDC merged 20 commits into
feature/setupFlowImprovementsfrom
main
Aug 16, 2026
Merged

DKeatonDC merged 20 commits into
feature/setupFlowImprovementsfrom
main

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This pull request was automatically generated because an automated merge hit a merge conflict

DKeatonDC and others added 5 commits June 9, 2026 20:17
Updated flow description to clarify its purpose and usage.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
@salesforce-cla

Copy link
Copy Markdown

Thanks for the contribution! Before we can merge this, we need @dirkkeaton to sign the Salesforce Inc. Contributor License Agreement.

DKeatonDC and others added 3 commits August 6, 2026 14:33
Restores named folder to allow package to build.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Used to restore the unfiled templates.  In this unlovely scenario, we have identical templates in unfiled and in the named folder, but this may be necessary to build.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
@DKeatonDC
DKeatonDC requested a review from a team as a code owner August 12, 2026 11:50
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
…ribeSetup

Limits Creation of Unsubscribe Record to 1
jstvz and others added 2 commits August 13, 2026 17:19
The two HTML sample templates cannot deploy as unmanaged metadata via
unpackaged/post. They reference the packaged Visualforce component across
a namespace boundary, and the component attribute recipientId is not
access="global". The platform rejects the cross-namespace call:

  Cannot use attribute recipientid without global access in a
  component/page that is not in the same namespace as the component

Remove:
- Unsubscribe_Contact_Template_HTML.email (+ meta)
- Unsubscribe_Lead_Template_HTML.email (+ meta)

Keep the plain-text sample. Add the CumulusCI namespace token so the
merge field resolves in both managed and unmanaged contexts:

  {!Recipient.%%%NAMESPACE%%%Unsubscribe_Url_Plain_Text__c}

With this change the install path deploys clean. HTML sample delivery is
left as a product decision (see follow-up on #217).
…lates

Drop HTML sample email templates from unpackaged/post
@DKeatonDC
DKeatonDC merged commit 7b34853 into feature/setupFlowImprovements Aug 16, 2026
3 checks passed

This branch was successfully deployed

1 active deployment
packaging — e828cda4 Deployed Aug 14, 2026 by DKeatonDC via Upload Beta 2GP / Beta Test #39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants