Commits · 287cac5eb698a8a838c581503e08bbd7c3ff5588 · AlekSIS® / Official / AlekSIS-App-Alsijil

Jun 18, 2020

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

287cac5e

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
  
  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
  
  c0e47390
- Merge branch 'master' into 73-add-rules-and-permissions · a85bcae6
  Jonathan Weth authored 4 years ago
  
  a85bcae6
- Merge branch 'master' into 73-add-rules-and-permissions · 45de9a0c
  Hangzhi Yu authored 4 years ago
  
  45de9a0c
- 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
  
  332acf86
- Show date of weekday in week overview · dcd6788f
  Jonathan Weth authored 4 years ago
  
  dcd6788f
- Relocate print button · b25bce8d
  Julian authored 4 years ago
  
  b25bce8d
- Move save_button.html · 24735ff8
  Julian authored 4 years ago
  
  24735ff8
- Merge branch '60-make-alsijil-work-with-current-core' into 'master' · 772ea75c
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Make Alsijil work with current core" Closes #60 See merge request !43
  772ea75c
Jun 14, 2020
- Add rules and permissions for some views · 6e338635
  Hangzhi Yu authored 4 years ago
  
  6e338635
Jun 13, 2020
- Merge branch '60-make-alsijil-work-with-current-core' into fix/design · b48a2a05
  Jonathan Weth authored 4 years ago
  
  b48a2a05
- Merge branch 'master' into 60-make-alsijil-work-with-current-core · f7597d17
  Jonathan Weth authored 4 years ago
  
  f7597d17
- Merge branch '60-make-alsijil-work-with-current-core' into fix/design · 8e16459c
  Jonathan Weth authored 4 years ago
  
  8e16459c
- Use SchoolTerm instead of SchoolYear and catch non-existing school term · e6b86387
  Jonathan Weth authored 4 years ago
  
  e6b86387
- Merge branch 'core-246-reorganise-templates' into 'master' · 2e4d67c8
  Jonathan Weth authored 4 years ago
  
  Reorganise templates. Advances AlekSIS/official/AlekSIS#246 See merge request !47
  2e4d67c8
- Merge branch 'master' into core-246-reorganise-templates · fcf53375
  Jonathan Weth authored 4 years ago
  
  fcf53375
- Update poetry.lock · dc9817f1
  Jonathan Weth authored 4 years ago
  
  dc9817f1
Jun 12, 2020
- Reorganise templates. Advances AlekSIS/official/AlekSIS#246 · 4610bab5
  Tom Teichler authored 4 years ago
  
  4610bab5
- Update image, center it and limit its sizes · 40d877cc
  Julian authored 4 years ago
  
  40d877cc
- Rename annotation in template · 7f86898a
  Julian authored 4 years ago
  
  7f86898a