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: set frappe hr logo in Navbar Settings for frappehr.com sites only (backport #1061) #1062

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #1061 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

#1061)

* chore: remove app logo

- framework fetches the last app logo and sets it in the navbar, doesn't make sense for desk apps to override each others' logos

* fix: set frappe hr logo in Navbar Settings for frappehr.com sites

(cherry picked from commit b1a7822)
@mergify mergify bot requested a review from ruchamahabal as a code owner November 16, 2023 05:53
@ruchamahabal ruchamahabal merged commit 0f59266 into version-15-hotfix Nov 16, 2023
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1061 branch November 16, 2023 05:56
frappe-pr-bot pushed a commit that referenced this pull request Nov 17, 2023
# [15.3.0](v15.2.0...v15.3.0) (2023-11-17)

### Bug Fixes

* `get_previous_allocation` return value ([3a75e90](3a75e90))
* set frappe hr logo in Navbar Settings for frappehr.com sites only ([#1061](#1061)) ([#1062](#1062)) ([0f59266](0f59266))
* show only active employees ([#1026](#1026)) ([#1068](#1068)) ([bb93127](bb93127))
* use `get_all` instead of `get_list` ([d37756d](d37756d))

### Features

* 'Email Salary Slips' bulk action in salary slip list view ([#1063](#1063)) ([#1065](#1065)) ([f738028](f738028))

### Performance Improvements

* index most queried fields in Leave Ledger Entry ([9f2671a](9f2671a))
* limit rows to 1 for cf leave expiry query ([1db1fc5](1db1fc5))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.3.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants