Commits · 0568a5fc1b90af2c64f433182bf8864966584455 · AlekSIS® / Official / AlekSIS-Core

Jul 18, 2023

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 11, 2023

Merge branch 'weblate-frontend' into 'master' · 1e9afcf7
Jonathan Weth authored 1 year ago
```
Translations update from Weblate

See merge request !1272
```
1e9afcf7

Translated using Weblate (German) · ab8ecd61

Jonathan Weth authored 1 year ago

Currently translated at 100.0% (198 of 198 strings)

Translation: AlekSIS/AlekSIS-Core-Frontend
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-core-frontend/de/

ab8ecd61

Jul 10, 2023
- Translated using Weblate (Russian) · ef38fef8
  Serhii Horichenko authored 1 year ago
  
  Currently translated at 100.0% (157 of 157 strings) Translation: AlekSIS/AlekSIS-Core-Frontend Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-core-frontend/ru/
  ef38fef8
- Merge branch '884-simple-brint-base-template-missing-base' into 'master' · 1b6bbe92
  Jonathan Weth authored 1 year ago
  
  Resolve "SImple brint base template missing <base>" Closes #884 See merge request !1290
  1b6bbe92
- FIx simple base print template for external storages · 3a71455b
  Nik | Klampfradler authored 1 year ago
  
  3a71455b
Jul 08, 2023
- Merge branch 'renovate/django-titofisto-1.x' into 'master' · c5e67feb
  Nik | Klampfradler authored 1 year ago
  
  Update dependency django-titofisto to v1 See merge request !1289
  c5e67feb
- Merge branch 'renovate/graphene-django-3.x' into 'master' · 694b21c7
  Nik | Klampfradler authored 1 year ago
  
  Update dependency graphene-django to >=3.0.0, <=3.1.2 See merge request !1288
  694b21c7
- Amend changelog · bb5d76ab
  Nik | Klampfradler authored 1 year ago
  
  bb5d76ab
- Enable upload slot system of titofisto · 5ab6b759
  Nik | Klampfradler authored 1 year ago
  
  5ab6b759
Jul 07, 2023
- Update dependency django-titofisto to v1 · 2cc50053
  Tine Wittler authored 1 year ago
  
  2cc50053
Jul 06, 2023
- Update dependency graphene-django to >=3.0.0, <=3.1.2 · 09f02b1c
  Tine Wittler authored 1 year ago
  
  09f02b1c
- Merge branch '831-data-management-for-the-model-room' into 'master' · 7058e64c
  Nik | Klampfradler authored 1 year ago
  
  Resolve "Data management for the Models `Room` and `SchoolTerm`" Closes #831 and #715 See merge request !1208
  7058e64c
- Add migration · 04efa12e
  Nik | Klampfradler authored 1 year ago
  
  04efa12e
- Fix file name · 769e6c94
  Nik | Klampfradler authored 1 year ago
  
  769e6c94
- Merge branch 'master' into '831-data-management-for-the-model-room' · 2e2c6cef
  Nik | Klampfradler authored 1 year ago
  
  # Conflicts: # CHANGELOG.rst
  2e2c6cef
- Merge branch 'renovate/django-cleanup-8.x' into 'master' · 9541bc75
  Nik | Klampfradler authored 1 year ago
  
  Update dependency django-cleanup to v8 See merge request !1265
  9541bc75
- Bump version to 4.0.0.dev0 · fe187f04
  Nik | Klampfradler authored 1 year ago
  
  fe187f04
- Replace CurrentSiteManager with new base manager · 6dec8613
  Nik | Klampfradler authored 1 year ago
  
  6dec8613
- Revert double messages loading introduced by strange merge · 71106b5f
  Nik | Klampfradler authored 1 year ago
  
  71106b5f
- Revert "Fix conflicting migration naming" · 24a87492
  Nik | Klampfradler authored 1 year ago
  
  This reverts commit 6a893fc4.
  24a87492
- Add managed models to changelog · 09c3e104
  Nik | Klampfradler authored 1 year ago
  
  09c3e104
- Update changelog · 51b3f267
  Jonathan Weth authored 1 year ago
  
  51b3f267
- Drop old management views for school terms · 29e6fe82
  Jonathan Weth authored 1 year ago
  
  29e6fe82
- Reactivate linter · 0a9fd703
  Jonathan Weth authored 1 year ago
  
  0a9fd703
- Fix room permission · 83bd6dbb
  Jonathan Weth authored 1 year ago
  
  83bd6dbb
- Drop debug middleware of graphene · 7061b8b3
  Jonathan Weth authored 1 year ago
  
  7061b8b3
- Rename CloseableSnackbar to ClosableSnackbar · d336da9a
  Jonathan Weth authored 1 year ago
  
  d336da9a
- Reformat and fix lint · cd8d45ca
  Jonathan Weth authored 1 year ago
  
  cd8d45ca
- Merge branch '881-docker-build-succeeds-even-if-vite-build-fails' into 'master' · b50c2293
  Nik | Klampfradler authored 1 year ago
  
  Resolve "[Docker] Build succeeds even if vite build fails" Closes #881 See merge request !1287
  b50c2293
- Fix return code of vite build management command · 3ffa48a9
  Nik | Klampfradler authored 1 year ago
  
  3ffa48a9
- Merge branch 'master' into 831-data-management-for-the-model-room · 9b223b61
  Jonathan Weth authored 1 year ago
  
  9b223b61
Jul 05, 2023
- Update dependency django-cleanup to v8 · 77afc73a
  Tine Wittler authored 1 year ago
  
  77afc73a
- Merge branch 'release-3.1.2' into 'master' · 1cee605a
  Nik | Klampfradler authored 1 year ago
  
  Release 3.1.2 See merge request !1286
  1cee605a
- Bump version to 3.1.2.dev0 · b9b24373
  Jonathan Weth authored 1 year ago
  
  b9b24373