Commits · 5143e01108f3d8c0012cf9a8c9f79999c29d99db · AlekSIS® / Official / AlekSIS-App-Alsijil

Aug 03, 2020

Merge branch 'master' into 73-add-rules-and-permissions · 5143e011

Jonathan Weth authored 4 years ago

# Conflicts:
#	aleksis/apps/alsijil/menus.py
#	aleksis/apps/alsijil/models.py
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py

Verified

5143e011

Update translation files · 0b8aa003
Jonathan Weth authored 4 years ago

Verified

0b8aa003

Translated using Weblate (German) · bd97442c

magicfelix authored 4 years ago

Currently translated at 100.0% (125 of 125 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/de/

bd97442c

Aug 02, 2020
- Merge branch '82-do-not-count-cancelled-lessons' into 'master' · 7ee76c90
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Do not allow to add personal notes for cancelled lessons" Closes #82 See merge request !61
  7ee76c90
- Make blocking of adding personal notes for cancelled lessons configurable · 22e3f80d
  Jonathan Weth authored 4 years ago
  
  Verified
  
  22e3f80d
Aug 01, 2020
- Merge branch 'master' into 82-do-not-count-cancelled-lessons · 1928e6ea
  Jonathan Weth authored 4 years ago
  
  Verified
  
  1928e6ea
- Update poetry.lock · f58a00cf
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f58a00cf
- Reformat · 89379eae
  Jonathan Weth authored 4 years ago
  
  Verified
  
  89379eae
- Reformat · 068a0cd2
  Jonathan Weth authored 4 years ago
  
  Verified
  
  068a0cd2
- Remove legacy query · 64c57bb0
  Jonathan Weth authored 4 years ago
  
  Verified
  
  64c57bb0
- Merge branch 'master' into 82-do-not-count-cancelled-lessons · 45614af4
  Jonathan Weth authored 4 years ago
  
  Verified
  
  45614af4
- Fix doubled tags in template · c2891c34
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c2891c34
Jul 31, 2020
- Merge branch '62-show-lesson-topic-in-week-overview' into 'master' · 69fa177d
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Show lesson topic and group in week overview" Closes #62 See merge request !75
  69fa177d
- Show lesson topic and groups in week view · b98f13aa
  Jonathan Weth authored 4 years ago
  
  Groups are only shown if the current page doesn't show a group
  Verified
  
  b98f13aa
- Fix migration history · d519bea1
  Jonathan Weth authored 4 years ago
  
  Verified
  
  d519bea1
- Merge branch '89-only-show-group-members-in-full-register-printout-too' into 'master' · d045eccc
  Nik | Klampfradler authored 4 years ago
  
  Resolve "[Full register] Only show personal notes of group members" Closes #89 See merge request !70
  d045eccc
- Merge branch '85-add-option-to-configure-extra-marks-for-personal-notes' into 'master' · 8fa024da
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Add option to configure extra marks for personal notes" Closes #85 See merge request !68
  8fa024da
- Merge branch 'master' into 85-add-option-to-configure-extra-marks-for-personal-notes · 0bc8ec73
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0bc8ec73
Jul 30, 2020

Merge branch '87-move-version-history-to-own-tab' into 'master' · bf05b372
Nik | Klampfradler authored 4 years ago
```
Resolve "[Lesson view] Organise information in tabs"

Closes #87

See merge request !69
```
bf05b372

Merge branch... · f7008a9a

Nik | Klampfradler authored 4 years ago

Merge branch '88-ensure-that-full_register-only-counts-personal-notes-in-the-selected-school-term' into 'master'

Resolve "[Full register] Filter personal notes by school term"

Closes #88

See merge request !71

f7008a9a

Jul 28, 2020

Translated using Weblate (German) · b016ec19

Jonathan Weth authored 4 years ago

Currently translated at 99.2% (124 of 125 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/de/

b016ec19

Jul 26, 2020

Update translation files · 66990632
Jonathan Weth authored 4 years ago

Verified

66990632

Translated using Weblate (Latin) · 222d0321

Julian authored 4 years ago

Currently translated at 10.0% (8 of 80 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/

222d0321

Translated using Weblate (Latin) · d3993eca

Jonathan Weth authored 4 years ago

Currently translated at 10.0% (8 of 80 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/

d3993eca

Translated using Weblate (French) · 3fe07f4c

Marlene Grundey authored 4 years ago

Currently translated at 73.7% (59 of 80 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/fr/

3fe07f4c

Translated using Weblate (German) · 85922878

Tom Teichler authored 4 years ago

Currently translated at 100.0% (80 of 80 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/de/

85922878

Translated using Weblate (German) · a6fa9944

Jonathan Weth authored 4 years ago

Currently translated at 100.0% (80 of 80 strings)

Translation: AlekSIS/AlekSIS-App-Alsijil
Translate-URL: https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/de/

a6fa9944

Add .tox to .gitignore · 10d70ebc
Jonathan Weth authored 4 years ago

Verified

10d70ebc

Jul 22, 2020
- Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher · 63c96016
  Hangzhi Yu authored 4 years ago
  
  63c96016
- Show only personal notes of (historical) group members · 1229e2ec
  Jonathan Weth authored 4 years ago
  
  Archive groups of a person for every personal note to check against it to decide what data should be displayed in full register print out
  Verified
  
  1229e2ec
- Add rules&permissions for excuse types · 62c3ea5d
  Hangzhi Yu authored 4 years ago
  
  62c3ea5d
Jul 20, 2020

Merge branch 'master' into 73-add-rules-and-permissions · 9cff3804

Hangzhi Yu authored 4 years ago

# Conflicts:
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py

9cff3804

Jul 18, 2020
- Remove legacy personal notes filters in favor of extra marks · a66dc7a9
  Jonathan Weth authored 4 years ago
  
  Verified
  
  a66dc7a9
- Fix migration history · 579f7532
  Jonathan Weth authored 4 years ago
  
  Verified
  
  579f7532
- Merge branch 'master' into 82-do-not-count-cancelled-lessons · 16deaf83
  Jonathan Weth authored 4 years ago
  
  Verified
  
  16deaf83
- Merge branch '68-add-support-for-group-notes' into 'master' · 30aea56d
  Jonathan Weth authored 4 years ago
  
  Resolve "Add support for group notes" Closes #68 See merge request !65
  30aea56d
- Apply 1 suggestion(s) to 1 file(s) · cc53b002
  Jonathan Weth authored 4 years ago
  
  cc53b002
- [Full register] Filter data by school term · b7605ee6
  Jonathan Weth authored 4 years ago
  
  Verified
  
  b7605ee6
Jul 17, 2020
- Reformat predicates · 0292d973
  Hangzhi Yu authored 4 years ago
  
  0292d973
- Fix is_person_group_owner predicate · 7365b60b
  Hangzhi Yu authored 4 years ago
  
  7365b60b