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: don't copy "Standard" on dashboard chart (backport #26649) #26651

Merged
merged 2 commits into from
Jun 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2024


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

(cherry picked from commit b119367)

# Conflicts:
#	frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@mergify mergify bot requested a review from a team June 3, 2024 08:15
@mergify mergify bot added the conflicts label Jun 3, 2024
@mergify mergify bot requested review from ankush and removed request for a team June 3, 2024 08:15
@mergify mergify bot assigned ankush Jun 3, 2024
Copy link
Contributor Author

mergify bot commented Jun 3, 2024

Cherry-pick of b119367 has failed:

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

You are currently cherry-picking commit b1193675dd.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/doctype/dashboard_chart/dashboard_chart.json

no changes added to commit (use "git add" and/or "git commit -a")

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

@ankush ankush enabled auto-merge (squash) June 3, 2024 09:38
@ankush ankush merged commit 719522d into version-15-hotfix Jun 3, 2024
17 of 18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-26649 branch June 3, 2024 09:57
frappe-pr-bot pushed a commit that referenced this pull request Jun 4, 2024
## [15.29.1](v15.29.0...v15.29.1) (2024-06-04)

### Bug Fixes

* **address_query:** show search fields in description if set ([4db0b53](4db0b53))
* **address_query:** use title field if set ([01a00e3](01a00e3))
* allow creation of workspace based on desk role perms ([fb898f7](fb898f7))
* Auto Email Report not working when Add Total Row is enabled ([#26668](#26668)) ([e585657](e585657))
* Avoid concurrent TODO updates ([#26594](#26594)) ([cee96b9](cee96b9))
* bypass IP restriction for the methods required for our socketio backend ([42011c9](42011c9))
* **checkbox:** Fix checkbox size on small screens ([#26596](#26596)) ([#26612](#26612)) ([fc2a852](fc2a852))
* delete old user notification settings when merging users ([#26604](#26604)) ([#26619](#26619)) ([af1a47d](af1a47d))
* don't copy "Standard" on dashboard chart (backport [#26649](#26649)) ([#26651](#26651)) ([719522d](719522d))
* front-end bug in 'customize_form.js', triggered by delete actions on child-tables ([#26344](#26344)) ([b9f4845](b9f4845)), closes [#26041](#26041) [#26041](https://github.com/frappe/issues/26041) [#26041](#26041)
* kanban filters fixes ([#26605](#26605)) ([#26610](#26610)) ([af7f550](af7f550))
* **link-preview:** Correct synchronization of preview data on change. ([#26641](#26641)) ([#26654](#26654)) ([c34c1d1](c34c1d1))
* **make_request:** don't blindly try to check the content-type ([2fc914f](2fc914f))
* **number_card:** ensure value is returned ([0a91f04](0a91f04))
* **UX:** multi-tab experience ([#26309](#26309)) ([#26646](#26646)) ([3e4fff7](3e4fff7))

### Performance Improvements

* memory leak on kanban refresh ([#26597](#26597)) ([#26599](#26599)) ([8b8a297](8b8a297))
* rearrange some frequent jobs ([#26591](#26591)) ([#26603](#26603)) ([d9b7d73](d9b7d73))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.29.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 27, 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