Commits · master · AlekSIS® / Official / AlekSIS-App-Chronos

25 Jan, 2023 1 commit
- Merge branch 'bump-version-3.0dev' into 'master' · 62010c42
  Dominik George authored Jan 25, 2023
```
Bump version to 3.0dev0 and depend on newer core

See merge request !293
```
  62010c42
24 Jan, 2023 1 commit
- Bump version to 3.0dev0 and depend on newer core · e501daed
  Dominik George authored Jan 24, 2023
  
  e501daed
23 Jan, 2023 1 commit
- Merge branch 'fix-spelling-mistake-an-lesson' into 'master' · 840e0afa
  Jonathan Weth authored Jan 23, 2023
```
Fix spelling mistake

See merge request !292
```
  840e0afa
22 Jan, 2023 1 commit
- Fix spelling mistake · 04851d42
  magicfelix authored Jan 22, 2023
  
  04851d42
18 Jan, 2023 3 commits
- Merge branch '197-adaptations-for-spa-operation' into 'master' · 1c503d0e
  Dominik George authored Jan 18, 2023
```
Resolve "Adaptations for SPA operation"

Closes #197

See merge request !290
```
  1c503d0e
- Add SPA support · 2c8bc2ff
  Hangzhi Yu authored Jan 18, 2023
  
  2c8bc2ff
- Merge branch '192-3-0-drop-room-from-model' into 'master' · 426bdd2a
  Dominik George authored Jan 18, 2023
```
Resolve "[3.0] Drop Room from model"

Closes #192

See merge request !284
```
  426bdd2a
28 Dec, 2022 1 commit
- Rename faulty reference to core migration · 4a7a6502
  Hangzhi Yu authored Dec 28, 2022
  
  4a7a6502
19 Dec, 2022 3 commits
- Merge branch '195-fix-the-fix' into 'master' · a7d38c99
  Dominik George authored Dec 19, 2022
```
Fix error on daily supervisions page

See merge request !289
```
  a7d38c99
- Fix error on daily supervisions page · bffb1a63
  magicfelix authored Dec 19, 2022
  
  bffb1a63
- Bump resint · d8174ab0
  Tom Teichler authored Dec 19, 2022
  
  d8174ab0
18 Dec, 2022 6 commits
- Merge branch '192-3-0-drop-room-from-model' of... · fababe86
  Tom Teichler authored Dec 18, 2022
```
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 Dec 18, 2022
  
  2f5e734b
- Merge branch 'rename-ugettext' into 'master' · 08d59a4d
  Tom Teichler authored Dec 18, 2022
```
Rename ugettext reference

See merge request !288
```
  08d59a4d
- Rename ugettext reference · bf5276fe
  magicfelix authored Dec 18, 2022
  
  bf5276fe
- Fix models ForeignKeys, move search index to core · eba8450c
  Tom Teichler authored Dec 18, 2022
  
  eba8450c
- Reformat and sort imports · febc825e
  Tom Teichler authored Dec 18, 2022
  
  febc825e
16 Dec, 2022 2 commits
- Rename migration · 9943056c
  Tom Teichler authored Dec 16, 2022
  
  9943056c
- Merge branch 'master' into 192-3-0-drop-room-from-model · e8b416e3
  Tom Teichler authored Dec 16, 2022
  
  e8b416e3
14 Dec, 2022 4 commits
- Merge branch '195-migrations-fail-with-programmingerror' into 'master' · a852cd29
  Dominik George authored Dec 14, 2022
```
Resolve "Migrations fail with ProgrammingError"

Closes #195

See merge request !285
```
  a852cd29
- Rename Migration from core · 796012d1
  Lukas Weichelt authored Dec 14, 2022
  
  796012d1
- Merge branch... · f82d4be0
  Dominik George authored Dec 14, 2022
```
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 !282
```
  f82d4be0
- Apply 1 suggestion(s) to 1 file(s) · 91270dc7
  Dominik George authored Dec 14, 2022 and Hangzhi Yu committed Dec 14, 2022
  
  91270dc7
12 Dec, 2022 2 commits
- Merge branch '196-attributeerror-nonetype-object-has-no-attribute-period' into 'master' · 164bb66b
  Dominik George authored Dec 12, 2022
```
Resolve "AttributeError: 'NoneType' object has no attribute 'period'"

Closes #196

See merge request !286
```
  164bb66b
- Merge branch '190-sort-supervisions-by-time' into 'master' · ae9ee9da
  Dominik George authored Dec 12, 2022
```
Sort supervisions by period

Closes #190

See merge request !287
```
  ae9ee9da
09 Dec, 2022 1 commit
- Get period min/max for events from the event's school term and not from the current · 36add025
  Jonathan Weth authored Dec 03, 2022
  
  36add025
06 Dec, 2022 1 commit
- Sort supervisions by period · c617b677
  magicfelix authored Dec 06, 2022
  
  c617b677
02 Dec, 2022 2 commits
- Use badges instead of coloring the entire row to show lesson/supervision status · c96e0174
  Hangzhi Yu authored Dec 02, 2022
  
  c96e0174
- Fix reference to SchoolTerm in filters.py · 0d14c499
  Hangzhi Yu authored Dec 02, 2022
  
  0d14c499
01 Dec, 2022 1 commit
- Add Migration for moving room object from chronos to core · 9dedaebb
  Lukas Weichelt authored Dec 01, 2022
  
  9dedaebb
30 Nov, 2022 1 commit
- Merge branch '191-substitution-form-allows-selecting-students' into 'master' · 1999f0f9
  Dominik George authored Nov 30, 2022
```
Resolve "Substitution form allows selecting students"

Closes #191

See merge request !283
```
  1999f0f9
18 Nov, 2022 2 commits
- Update changelog · 69388bd0
  magicfelix authored Nov 18, 2022
  
  69388bd0
- Show only teachers in Substituion forms · b9fe6f5f
  magicfelix authored Nov 18, 2022
  
  b9fe6f5f
16 Nov, 2022 1 commit

Merge branch... · f6ec9c07

Dominik George authored Nov 16, 2022

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

14 Nov, 2022 2 commits
- Improve rendering of substituted or cancelled items on daily lessons/supervisions pages · 98e0a70c
  Hangzhi Yu authored Nov 14, 2022
  
  98e0a70c
- Re-add pre-filtering and week annotation of LessonPeriods on daily lessons page · 427212da
  Hangzhi Yu authored Nov 14, 2022
  
  427212da
12 Nov, 2022 4 commits
- Merge branch 'release-2.5' into 'master' · eab49266
  Dominik George authored Nov 12, 2022
```
Prepare release 2.5

See merge request !280
```
  eab49266
- Bump to next dev version · 5ffda4b0
  Dominik George authored Nov 12, 2022
  
  5ffda4b0
- Prepare release 2.5 · 3939dd3c
  Dominik George authored Nov 12, 2022
  
  3939dd3c
- Merge branch '185-supervision-substitution-entering' into 'master' · daf9f599
  Dominik George authored Nov 12, 2022
```
Resolve "Supervision Substitution entering"

Closes #185

See merge request !279
```
  daf9f599