Commits · 840e0afa34a3f5a28724e94ec8ad02b0dc19a5d0 · AlekSIS® / Official / AlekSIS-App-Chronos

Jan 23, 2023
- Merge branch 'fix-spelling-mistake-an-lesson' into 'master' · 840e0afa
  Jonathan Weth authored 2 years ago
  
  Fix spelling mistake See merge request AlekSIS/official/AlekSIS-App-Chronos!292
  840e0afa
Jan 22, 2023
- Fix spelling mistake · 04851d42
  magicfelix authored 2 years ago
  
  04851d42
Jan 18, 2023
- Merge branch '197-adaptations-for-spa-operation' into 'master' · 1c503d0e
  Nik | Klampfradler authored 2 years ago
  
  Resolve "Adaptations for SPA operation" Closes #197 See merge request AlekSIS/official/AlekSIS-App-Chronos!290
  1c503d0e
- Add SPA support · 2c8bc2ff
  Hangzhi Yu authored 2 years ago
  
  2c8bc2ff
- Merge branch '192-3-0-drop-room-from-model' into 'master' · 426bdd2a
  Nik | Klampfradler authored 2 years ago
  
  Resolve "[3.0] Drop Room from model" Closes #192 See merge request !284
  426bdd2a
Dec 28, 2022
- Rename faulty reference to core migration · 4a7a6502
  Hangzhi Yu authored 2 years ago
  
  4a7a6502
Dec 19, 2022
- Merge branch '195-fix-the-fix' into 'master' · a7d38c99
  Nik | Klampfradler authored 2 years ago
  
  Fix error on daily supervisions page See merge request AlekSIS/official/AlekSIS-App-Chronos!289
  a7d38c99
- Fix error on daily supervisions page · bffb1a63
  magicfelix authored 2 years ago
  
  bffb1a63
- Bump resint · d8174ab0
  Tom Teichler authored 2 years ago
  
  d8174ab0
Dec 18, 2022
- Merge branch '192-3-0-drop-room-from-model' of... · fababe86
  Tom Teichler authored 2 years ago
  
  Merge branch '192-3-0-drop-room-from-model' of edugit.org:AlekSIS/official/AlekSIS-App-Chronos into 192-3-0-drop-room-from-model
  fababe86
- Bump core dependency · 2f5e734b
  Tom Teichler authored 2 years ago
  
  2f5e734b
- Merge branch 'rename-ugettext' into 'master' · 08d59a4d
  Tom Teichler authored 2 years ago
  
  Rename ugettext reference See merge request AlekSIS/official/AlekSIS-App-Chronos!288
  08d59a4d
- Rename ugettext reference · bf5276fe
  magicfelix authored 2 years ago
  
  bf5276fe
- Fix models ForeignKeys, move search index to core · eba8450c
  Tom Teichler authored 2 years ago
  
  eba8450c
- Reformat and sort imports · febc825e
  Tom Teichler authored 2 years ago
  
  febc825e
Dec 16, 2022
- Rename migration · 9943056c
  Tom Teichler authored 2 years ago
  
  9943056c
- Merge branch 'master' into 192-3-0-drop-room-from-model · e8b416e3
  Tom Teichler authored 2 years ago
  
  e8b416e3
Dec 14, 2022

Merge branch '195-migrations-fail-with-programmingerror' into 'master' · a852cd29
Nik | Klampfradler authored 2 years ago
```
Resolve "Migrations fail with ProgrammingError"

Closes #195

See merge request AlekSIS/official/AlekSIS-App-Chronos!285
```
a852cd29
Rename Migration from core · 796012d1
Lukas Weichelt authored 2 years ago

796012d1

Merge branch '187-optimize-rendering-of-substituted-lessons-supervisions-on-daily-lessons-supervisions-page' into 'master'

Resolve "Optimize rendering of substituted lessons/supervisions on daily lessons/supervisions page"

Closes #187

See merge request AlekSIS/official/AlekSIS-App-Chronos!282

f82d4be0

Apply 1 suggestion(s) to 1 file(s) · 91270dc7
Nik | Klampfradler authored 2 years ago and Hangzhi Yu committed 2 years ago

91270dc7

Dec 12, 2022
- Merge branch '196-attributeerror-nonetype-object-has-no-attribute-period' into 'master' · 164bb66b
  Nik | Klampfradler authored 2 years ago
  
  Resolve "AttributeError: 'NoneType' object has no attribute 'period'" Closes #196 See merge request AlekSIS/official/AlekSIS-App-Chronos!286
  164bb66b
- Merge branch '190-sort-supervisions-by-time' into 'master' · ae9ee9da
  Nik | Klampfradler authored 2 years ago
  
  Sort supervisions by period Closes #190 See merge request AlekSIS/official/AlekSIS-App-Chronos!287
  ae9ee9da
Dec 09, 2022
- Get period min/max for events from the event's school term and not from the current · 36add025
  Jonathan Weth authored 2 years ago
  
  36add025
Dec 06, 2022
- Sort supervisions by period · c617b677
  magicfelix authored 2 years ago
  
  c617b677
Dec 02, 2022
- Use badges instead of coloring the entire row to show lesson/supervision status · c96e0174
  Hangzhi Yu authored 2 years ago
  
  c96e0174
- Fix reference to SchoolTerm in filters.py · 0d14c499
  Hangzhi Yu authored 2 years ago
  
  0d14c499
Dec 01, 2022
- Add Migration for moving room object from chronos to core · 9dedaebb
  Lukas Weichelt authored 2 years ago
  
  9dedaebb
Nov 30, 2022
- Merge branch '191-substitution-form-allows-selecting-students' into 'master' · 1999f0f9
  Nik | Klampfradler authored 2 years ago
  
  Resolve "Substitution form allows selecting students" Closes #191 See merge request !283
  1999f0f9
Nov 18, 2022
- Update changelog · 69388bd0
  magicfelix authored 2 years ago
  
  69388bd0
- Show only teachers in Substituion forms · b9fe6f5f
  magicfelix authored 2 years ago
  
  b9fe6f5f
Nov 16, 2022

Merge branch... · f6ec9c07

Nik | Klampfradler authored 2 years ago

Merge branch '186-fix-missing-pre-filtering-and-week-annotation-of-lessonperiods-on-daily-lessons-page' into 'master'

Resolve "Fix missing pre-filtering and week annotation of LessonPeriods on daily lessons page"

Closes #186

See merge request !281

f6ec9c07

Nov 14, 2022
- Improve rendering of substituted or cancelled items on daily lessons/supervisions pages · 98e0a70c
  Hangzhi Yu authored 2 years ago
  
  98e0a70c
- Re-add pre-filtering and week annotation of LessonPeriods on daily lessons page · 427212da
  Hangzhi Yu authored 2 years ago
  
  427212da
Nov 12, 2022
- Merge branch 'release-2.5' into 'master' · eab49266
  Nik | Klampfradler authored 2 years ago
  
  Prepare release 2.5 See merge request AlekSIS/official/AlekSIS-App-Chronos!280
  eab49266
- Bump to next dev version · 5ffda4b0
  Nik | Klampfradler authored 2 years ago
  
  5ffda4b0
- Prepare release 2.5 · 3939dd3c
  Nik | Klampfradler authored 2 years ago
  
  View commits for tag 2.5 2.5
  
  3939dd3c
- Merge branch '185-supervision-substitution-entering' into 'master' · daf9f599
  Nik | Klampfradler authored 2 years ago
  
  Resolve "Supervision Substitution entering" Closes #185 See merge request AlekSIS/official/AlekSIS-App-Chronos!279
  daf9f599
Nov 09, 2022
- Check for validity range on daily supervision page · 9cb053f3
  Hangzhi Yu authored 2 years ago
  
  9cb053f3
- Add daily supervisions page and form for entering of supervision substitutions · bb519b69
  Hangzhi Yu authored 2 years ago
  
  bb519b69