Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make letterhead attachments public by default (backport #25925) #25926

Merged
merged 2 commits into from Apr 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2024

Also does it for web page.

Note: This is just default config, users can change while uploading.


This is an automatic backport of pull request #25925 done by [Mergify](https://mergify.com).

Also does it for web page.

Note: This is just default config, users can change while uploading.
(cherry picked from commit 535bc10)

# Conflicts:
#	frappe/printing/doctype/letter_head/letter_head.json
#	frappe/website/doctype/web_page/web_page.json
@mergify mergify bot requested a review from a team as a code owner April 12, 2024 05:16
@mergify mergify bot added the conflicts label Apr 12, 2024
@mergify mergify bot requested review from ankush and removed request for a team April 12, 2024 05:16
Copy link
Contributor Author

mergify bot commented Apr 12, 2024

Cherry-pick of 535bc10 has failed:

On branch mergify/bp/version-14-hotfix/pr-25925
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 535bc10340.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/integrations/doctype/webhook/test_webhook.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/printing/doctype/letter_head/letter_head.json
	both modified:   frappe/website/doctype/web_page/web_page.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ankush Apr 12, 2024
@ankush ankush enabled auto-merge (squash) April 12, 2024 07:27
@ankush ankush merged commit 6ea38b6 into version-14-hotfix Apr 12, 2024
8 of 11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-25925 branch April 12, 2024 07:44
frappe-pr-bot pushed a commit that referenced this pull request Apr 16, 2024
# [14.72.0](v14.71.0...v14.72.0) (2024-04-16)

### Bug Fixes

* handle empty style tag ([#25910](#25910)) ([#25915](#25915)) ([771fa80](771fa80))
* handle interface error during report timeout ([#25893](#25893)) ([#25894](#25894)) ([5d4e106](5d4e106))
* make letterhead attachments public by default (backport [#25925](#25925)) ([#25926](#25926)) ([6ea38b6](6ea38b6))
* make_error_msg for imap ([b2cfa49](b2cfa49))

### Features

* add option to set default email recipients ([#25555](#25555)) ([dc070a4](dc070a4))
* allow wildcard for doctype in permission hooks ([#25729](#25729)) ([#25891](#25891)) ([af33091](af33091))
* **Customize Form:** add "Trim Table" action (backport [#25923](#25923)) ([#25934](#25934)) ([ad34d52](ad34d52))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.72.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants