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: Employee Dashboard must accomodate Document Links (backport #1103) #1121

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2023

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- Don't override incoming `data` instead add to it

(cherry picked from commit e802cf9)
@mergify mergify bot requested a review from ruchamahabal as a code owner November 28, 2023 12:27
@ruchamahabal ruchamahabal merged commit 42c9591 into version-15-hotfix Nov 28, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1103 branch November 28, 2023 14:38
frappe-pr-bot pushed a commit that referenced this pull request Nov 29, 2023
## [15.4.1](v15.4.0...v15.4.1) (2023-11-29)

### Bug Fixes

* Dashboard must accomodate Document Links ([#1103](#1103)) ([#1121](#1121)) ([42c9591](42c9591))
* Employee role perms for Employee Grievance and Grievance Type ([#1115](#1115)) ([#1119](#1119)) ([db7ce38](db7ce38))
* handle null & empty shift ('') values in Monthly Attendance Sheet ([#1123](#1123)) ([#1126](#1126)) ([69160de](69160de))
* rendering of Leaves with Half Day in Calendar View ([#1117](#1117)) ([da639b3](da639b3))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.4.1 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants