Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

fb9b76c2

Commit fb9b76c2 authored 1 year ago by Julian

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/manage-holidays' into manage-holidays

parents 79a725af 1eb04ec5

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 4 additions, 4 deletions

CHANGELOG.rst
aleksis/core/frontend/components/holiday/HolidayInlineList.vue 4 additions, 6 deletions

...is/core/frontend/components/holiday/HolidayInlineList.vue
aleksis/core/frontend/messages/en.json 9 additions, 0 deletions

aleksis/core/frontend/messages/en.json
aleksis/core/frontend/routes.js 1 addition, 1 deletion

aleksis/core/frontend/routes.js
aleksis/core/rules.py 26 additions, 1 deletion

aleksis/core/rules.py
aleksis/core/schema/__init__.py 5 additions, 7 deletions

aleksis/core/schema/__init__.py
aleksis/core/schema/holiday.py 7 additions, 6 deletions

aleksis/core/schema/holiday.py

with 56 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment