Commits · f3cc545ca40c20855c97069d5e2d08b1d1fa4215 · AlekSIS® / Official / AlekSIS-App-Alsijil

Jun 20, 2020
- Convert pks of lesson periods to list to simplify query · f3cc545c
  Jonathan Weth authored 4 years ago
  
  Reason: A too complex query can cause database problems.
  Verified
  
  f3cc545c
Jun 19, 2020
- Fix permission names and core/alsijil relation · fbbb6020
  Jonathan Weth authored 4 years ago
  
  Verified
  
  fbbb6020
Jun 18, 2020
- Move annotate before union because annotating works only before union · 93203b44
  Jonathan Weth authored 4 years ago
  
  Verified
  
  93203b44
- Fix lint issues and reformat files · 6b0eedfd
  Jonathan Weth authored 4 years ago
  
  Verified
  
  6b0eedfd
- Merge branch 'master' into 73-add-rules-and-permissions · 95f16ef8
  Jonathan Weth authored 4 years ago
  
  Verified
  
  95f16ef8
- Merge branch '63-status-icon' into 'master' · 43e6be1f
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Show status icon for every lesson" Closes #63 See merge request !50
  43e6be1f
- Merge branch 'fix/lint-reformat' into 'master' · b20bb4f3
  Nik | Klampfradler authored 4 years ago
  
  Fix lint issues and reformat all files See merge request !53
  b20bb4f3
- Fix order of queries in week view · c8791096
  Jonathan Weth authored 4 years ago
  
  Week has to be annotated before querying teachers
  Verified
  
  c8791096
- Merge branch '75-absence-values-get-multiplied' into 'master' · c83ec781
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Fix aggregation of absences and tardninesses" Closes #75 See merge request !52
  c83ec781
- Fix lint issues and reformat all files · 29e6a6ab
  Jonathan Weth authored 4 years ago
  
  Verified
  
  29e6a6ab
- Fix aggregation of absences and tardinesses (no multiplication) · add5ccd7
  Jonathan Weth authored 4 years ago
  
  Verified
  
  add5ccd7
- Merge branch 'master' into 73-add-rules-and-permissions · 442e28eb
  Jonathan Weth authored 4 years ago
  
  Verified
  
  442e28eb
- Merge branch '73-add-rules-and-permissions' of... · 287cac5e
  Jonathan Weth authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  Verified
  
  287cac5e
- Update poetry.lock · c940fbce
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c940fbce
Jun 17, 2020
- Fix typo · 53bfe409
  Hangzhi Yu authored 4 years ago
  
  53bfe409
- Add tooltips in alsijil_helpers.py · 2011793a
  Hangzhi Yu authored 4 years ago
  
  2011793a
- Replace ugettext with gettext · a95d775a
  Hangzhi Yu authored 4 years ago
  
  a95d775a
- Add rules&permissions in class register template · 420f07a0
  Hangzhi Yu authored 4 years ago
  
  420f07a0
- Fix order of has_perm and perm check in lesson template · 2a84050c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  2a84050c
- Merge branch '73-add-rules-and-permissions' of... · 451cdb33
  root authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  451cdb33
- Merge branch 'master' into 73-add-rules-and-permissions · c0e47390
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c0e47390
- Merge branch 'master' into 73-add-rules-and-permissions · a85bcae6
  Jonathan Weth authored 4 years ago
  
  Verified
  
  a85bcae6
- Merge branch 'master' into 73-add-rules-and-permissions · 45de9a0c
  Hangzhi Yu authored 4 years ago
  
  45de9a0c
- Merge branch 'master' into 63-status-icon · 329d1a9e
  Jonathan Weth authored 4 years ago
  
  Verified
  
  329d1a9e
- Add some more rules&permissions · e65b4cb2
  Hangzhi Yu authored 4 years ago
  
  e65b4cb2
Jun 16, 2020
- Merge branch 'fix/design' into 'master' · a8b1b29c
  Jonathan Weth authored 4 years ago
  
  Review use of Materialize Closes #61 See merge request !48
  a8b1b29c
Jun 15, 2020
- Move print button correctly · 053893ba
  Julian authored 4 years ago
  
  053893ba
- Merge remote-tracking branch 'origin/fix/design' into fix/design · b016ee80
  Julian authored 4 years ago
  
  # Conflicts: # aleksis/apps/alsijil/templates/alsijil/week_view.html
  b016ee80
- Move delete button · fb8d2604
  Julian authored 4 years ago
  
  fb8d2604
- Minify notefilter form · d9cbc4b6
  Julian authored 4 years ago
  
  d9cbc4b6
- Change form title dynamically · 35aeb91f
  Julian authored 4 years ago
  
  35aeb91f
- Move checkboxes · 3983d8ac
  Julian authored 4 years ago
  
  3983d8ac
- Restructure Form · 8a5c509e
  Julian authored 4 years ago
  
  8a5c509e
- Use correct save_button · e6218fe3
  Julian authored 4 years ago
  
  e6218fe3
- Make tablerows in responsive tables the same height · 937a834e
  Julian authored 4 years ago
  
  937a834e
- Make links fill the td · 3a87e458
  Julian authored 4 years ago
  
  3a87e458
- Make any text in the week view table clickable · 2a86c53d
  Julian authored 4 years ago
  
  2a86c53d
- Restore alsijil.css · 720c1975
  Julian authored 4 years ago
  
  720c1975
- Add dot behind period number · 332acf86
  Jonathan Weth authored 4 years ago
  
  Verified
  
  332acf86
- Show date of weekday in week overview · dcd6788f
  Jonathan Weth authored 4 years ago
  
  Verified
  
  dcd6788f