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: miscellaneous desk UI fixes (backport #1955) #1975

Merged
merged 8 commits into from
Jul 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2024

miscellaneous desk UI/UX fixes


This is an automatic backport of pull request #1955 done by Mergify.

(cherry picked from commit d15b1fe)

# Conflicts:
#	hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
(cherry picked from commit 92b4fa1)

# Conflicts:
#	hrms/hr/doctype/job_offer/job_offer.json
…ng in error message

(cherry picked from commit 1c8a96b)

# Conflicts:
#	hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.json
(cherry picked from commit 3b30c75)
(cherry picked from commit 891f0b9)
@mergify mergify bot requested a review from ruchamahabal as a code owner July 15, 2024 12:27
@mergify mergify bot added the conflicts label Jul 15, 2024
Copy link
Contributor Author

mergify bot commented Jul 15, 2024

Cherry-pick of d15b1fe has failed:

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

You are currently cherry-picking commit d15b1fe48.
  (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:   hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json

Cherry-pick of 92b4fa1 has failed:

On branch mergify/bp/version-15-hotfix/pr-1955
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 92b4fa12d.
  (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:   hrms/hr/doctype/job_offer/job_offer.json

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

Cherry-pick of 1c8a96b has failed:

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

You are currently cherry-picking commit 1c8a96b4a.
  (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:   hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.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

@ruchamahabal ruchamahabal merged commit b6783d8 into version-15-hotfix Jul 15, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1955 branch July 15, 2024 13:04
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.24.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants