10000 feat: show helpdesk and crm banner on sidebar (backport #31761) by mergify[bot] · Pull Request #31763 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: show helpdesk and crm banner on sidebar (backport #31761) #31763

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Mar 17, 2025
Merged

feat: show helpdesk and crm banner on sidebar (backport #31761) #31763

merged 5 commits into from
Mar 17, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 17, 2025

Closes #31760

  • CRM Module
    image

  • Support Module
    image

no-docs

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

iamejaaz added 4 commits March 17, 2025 09:15
@iamejaaz @mergify
feat: show helpdesk and crm banner on sidebar
7441dd6 
(cherry picked from commit b133c7e)

# Conflicts:
#	frappe/public/js/frappe/list/list_sidebar.js
@iamejaaz @mergify
refactor: remove not used condition
b955540 
(cherry picked from commit 4760529)

# Conflicts:
#	frappe/public/js/frappe/list/list_sidebar.js
@iamejaaz @mergify
style: remove space
c0475a6 
(cherry picked from commit 64a1719)
@iamejaaz @mergify
refactor: change text of crm and links
e76dd9d 
(cherry picked from commit 631e56d)
@mergify mergify bot added the conflicts label Mar 17, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Mar 17, 2025

Cherry-pick of b133c7e has failed:

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

You are currently cherry-picking commit b133c7e34d.
  (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/public/js/frappe/list/list_sidebar.js

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

Cherry-pick of 4760529 has failed:

On branch mergify/bp/version-15-hotfix/pr-31761
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4760529446.
  (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/public/js/frappe/list/list_sidebar.js

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

@iamejaaz iamejaaz enabled auto-merge March 17, 2025 09:24
@iamejaaz iamejaaz merged commit d7b3531 into version-15-hotfix Mar 17, 2025
17 checks passed
@iamejaaz iamejaaz deleted the mergify/bp/version-15-hotfix/pr-31761 branch March 17, 2025 09:44
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.59.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 Apr 2, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@iamejaaz iamejaaz

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @iamejaaz
0