Manage holidays (!1261) · Merge requests · AlekSIS® / Official / AlekSIS-Core

Merged Julian requested to merge manage-holidays into master 1 year ago

Jul 25, 2023
- Merge remote-tracking branch 'origin/manage-holidays' into manage-holidays · fb9b76c2
  Julian authored 1 year ago
  
  fb9b76c2
- Include rrule.js · 79a725af
  Julian authored 1 year ago
  
  79a725af
Jul 22, 2023
- Update changelog · 1eb04ec5
  Jonathan Weth authored 1 year ago
  
  Verified
  
  1eb04ec5
- Fix lint · 144c25df
  Jonathan Weth authored 1 year ago
  
  Verified
  
  144c25df
- Drop debug prints · 40d7b83e
  Jonathan Weth authored 1 year ago
  
  Verified
  
  40d7b83e
- Fix permissions · e293efde
  Jonathan Weth authored 1 year ago
  
  Verified
  
  e293efde
Jul 21, 2023
- Set correct item title attribute for holidays · 27359faa
  Jonathan Weth authored 1 year ago
  
  Verified
  
  27359faa
- Fix holiday permissions · 2010326c
  Jonathan Weth authored 1 year ago
  
  Verified
  
  2010326c
- Add messages for holidays · 4171ebe7
  Jonathan Weth authored 1 year ago
  
  Verified
  
  4171ebe7
Jul 20, 2023
- Fix migration history · a98fe024
  Jonathan Weth authored 1 year ago
  
  Verified
  
  a98fe024
- Merge branch 'master' into manage-holidays · 1ca9e4a0
  Jonathan Weth authored 1 year ago
  
  Verified
  
  1ca9e4a0
Jul 18, 2023
- Remove duplicate migration · 8d8e388e
  Hangzhi Yu authored 1 year ago
  
  8d8e388e
- Fix pyproject.toml · 0568a5fc
  permcu authored 1 year ago
  
  Commit fa4df9e5 had unresolved merge conflicts. They are merged now. This also adds a newline the aleksolotl missed.
  0568a5fc
Jul 14, 2023
- Fix changelog · 061eafa8
  Hangzhi Yu authored 1 year ago
  
  061eafa8
- Merge branch 'manage-holidays' of edugit.org:AlekSIS/official/AlekSIS-Core into manage-holidays · 23460e74
  Hangzhi Yu authored 1 year ago
  
  23460e74
- Merge branch 'master' into manage-holidays · fa4df9e5
  Hangzhi Yu authored 1 year ago
  
  fa4df9e5
- Create field for child_groups · af81bbb0
  Julian authored 1 year ago
  
  af81bbb0
- Fix ForeignKeyField not returning object when attribute is set and new object is created · d190acb3
  Hangzhi Yu authored 1 year ago
  
  d190acb3
Jul 05, 2023
- Allow getting a group by id · 166bddf7
  Julian authored 1 year ago
  
  166bddf7
- Create managed_by_app_label migration for calendar events · 062cb7a5
  Julian authored 1 year ago
  
  062cb7a5
- Include vue-draggable-grid · 904ab25d
  Julian authored 1 year ago
  
  904ab25d
Jul 03, 2023
- Merge branch 'master' into manage-holidays · 8ac3f588
  Julian authored 1 year ago
  
  # Conflicts: # CHANGELOG.rst
  8ac3f588
- Fix migration history · dc34ad4a
  Julian authored 1 year ago
  
  dc34ad4a
- Merge branch '831-data-management-for-the-model-room' into manage-holidays · 69925162
  Julian authored 1 year ago
  
  # Conflicts: # CHANGELOG.rst # aleksis/core/frontend/plugins/aleksis.js # aleksis/core/managers.py # aleksis/core/schema/__init__.py
  69925162
Jun 29, 2023
- Merge branch 'calendar-object-feeds' into manage-holidays · e30ea1b1
  Julian authored 1 year ago
  
  e30ea1b1
- Merge branch '831-data-management-for-the-model-room' into manage-holidays · 5f98f1b8
  Julian authored 1 year ago
  
  5f98f1b8
Jun 11, 2023
- Initial frontend for managing holidays · c2a111ec
  Julian authored 1 year ago
  
  c2a111ec
Jun 10, 2023
- Create schema for holidays · f8d554c8
  Julian authored 1 year ago
  
  f8d554c8
Jun 09, 2023

Merge branch 'calendar-object-feeds' into 831-data-management-for-the-model-room · 6cbd1436

Julian authored 1 year ago

# Conflicts:
#	aleksis/core/frontend/index.js
#	aleksis/core/frontend/messages/en.json
#	aleksis/core/frontend/plugins/aleksis.js
#	aleksis/core/schema/__init__.py
#	pyproject.toml

6cbd1436

Manage holidays

Merge request reports

Activity