feat: export workspace sidebars by sokumon [frappe] PR#3710

From: https://github.com/frappe/hrms/pull/3710
Date: 2025-11-17 23:49:55+05:30

  • Merge pull request #3710 from frappe/workspace-sidebars
  • fix(Leaves): re-export leaves
  • feat(Employee Lifecycle): New Sidebar
  • feat: Frappe HR workspace
  • feat(Tax and Benefit): New Sidebar
  • feat(Salary Payout): New Sidebar
  • feat(Expense Claim): New Sidebar
  • feat(Performance): New Sidebar
  • feat(Recruitment): New Sidebar
  • feat(Attendance): New Sidebar
  • feat: new logos for all workspaces
  • feat(Leaves): New sidebar for the workspace
  • fix: export correct recruitment sidebar
  • feat: export workspace sidebars



Diagnostics

Suspicious merge commit detected: 0d4cda38ae11d7fdd155abf20aadfafce1118c8f



Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-3710

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-3710

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports

Loading