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.

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

feat: show holidays and colour code in attendance calendar (backport #1595) #1636

Merged
merged 6 commits into from
Apr 5, 2024
Merged

feat: show holidays and colour code in attendance calendar (backport #1595) #1636

merged 6 commits into from
Apr 5, 2024

Commits on Apr 5, 2024

  1. feat: show holidays and colour code in attendance calendar 

    (cherry picked from commit 4e39521)
    @vinyselopal @mergify
    vinyselopal authored and mergify[bot] committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    75c1e16 View commit details
    Browse the repository at this point in the history

  2. refactor: move import statements up 

    (cherry picked from commit b64d6b5)
    @vinyselopal @mergify
    vinyselopal authored and mergify[bot] committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    cc0dec1 View commit details
    Browse the repository at this point in the history

  3. chore: fix formatting 

    (cherry picked from commit 592010e)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    7fa4a79 View commit details
    Browse the repository at this point in the history

  4. chore: add read perm for Employee on Attendance 

    (cherry picked from commit c82d9a4)

# Conflicts:
#	hrms/hr/doctype/attendance/attendance.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    fd7409a View commit details
    Browse the repository at this point in the history

  5. chore: fix formatting & imports 

    (cherry picked from commit a7aab2a)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    145afda View commit details
    Browse the repository at this point in the history

  6. chore: fix conflicts

    @ruchamahabal
    ruchamahabal authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    1a0ec54 View commit details
    Browse the repository at this point in the history