Skip to content

Merge main into feature/cumulusCi4AddBackIn - #199

Open
github-actions[bot] wants to merge 91 commits into
feature/cumulusCi4AddBackInfrom
main
Open

Merge main into feature/cumulusCi4AddBackIn#199
github-actions[bot] wants to merge 91 commits into
feature/cumulusCi4AddBackInfrom
main

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

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

salgsstyrke and others added 30 commits July 24, 2025 16:58
cumulus ci and sfdx versions
…flowDefinition-meta.xml

flow definition does not need to be included.

Signed-off-by: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
update version numbers in sfdx-project.json
Change the name of the email template.

Signed-off-by: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
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>
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
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Removes creator's email from default in a variable and improves error handling.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
…d varaible in an attempt to trigger an error)
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.

9 participants