Commits · e08e412e1ada140c608021cb2aa1b8c45b954729 · AlekSIS® / Official / AlekSIS-Core

Jun 24, 2020
- Merge branch 'fix/template-paths-school-term' into 'master' · e08e412e
  Nik | Klampfradler authored 4 years ago
  
  Fix paths to core templates in some templates See merge request AlekSIS/official/AlekSIS!312
  e08e412e
- Merge branch 'extend-base-print' into 'master' · 651b3835
  Nik | Klampfradler authored 4 years ago
  
  Fix and extend base_print.html See merge request AlekSIS/official/AlekSIS!313
  651b3835
Jun 22, 2020
- Merge branch 'revert-b9fb222c ' into 'master' · 94958995
  Nik | Klampfradler authored 4 years ago
  
  Revert "Merge branch '133-implement-django-health-check' into 'master'" See merge request AlekSIS/official/AlekSIS!314
  94958995
- Revert "Merge branch '133-implement-django-health-check' into 'master'" · eeef13fb
  Nik | Klampfradler authored 4 years ago
  
  This reverts merge request !261
  eeef13fb
- Merge branch '133-implement-django-health-check' into 'master' · b9fb222c
  Jonathan Weth authored 4 years ago
  
  Resolve "Implement django-health-check" Closes #133 See merge request AlekSIS!261
  b9fb222c
- Merge branch 'master' into 133-implement-django-health-check · 291546a1
  Jonathan Weth authored 4 years ago
  
  Verified
  
  291546a1
Jun 21, 2020
- Fix usage of dynamic preferences in base_print.html · b14f43c3
  Jonathan Weth authored 4 years ago
  
  Verified
  
  b14f43c3
- Add option to set positions for page breaks in base_print.html · 73af7d4b
  Jonathan Weth authored 4 years ago
  
  Verified
  
  73af7d4b
- Fix width of content container in base_print.html · 58af2cd2
  Jonathan Weth authored 4 years ago
  
  Verified
  
  58af2cd2
Jun 20, 2020
- Change reference paths · dbe7a2b7
  Hangzhi Yu authored 4 years ago and Jonathan Weth committed 4 years ago
  
  Verified
  
  dbe7a2b7
- Fix paths to save_button.html in school term templates · 4898644e
  Jonathan Weth authored 4 years ago
  
  Verified
  
  4898644e
Jun 18, 2020
- Merge branch 'fix/paths-language-form-template' into 'master' · 3ffe64e2
  Nik | Klampfradler authored 4 years ago
  
  Fix paths to language form template See merge request AlekSIS/official/AlekSIS!310
  3ffe64e2
- Fix paths to language form template · aee7348e
  Jonathan Weth authored 4 years ago
  
  Verified
  
  aee7348e
Jun 16, 2020
- Merge branch 'master' into 133-implement-django-health-check · 982c6f49
  Tom Teichler authored 4 years ago
  
  Verified
  
  982c6f49
Jun 15, 2020
- Merge branch '40-link-data-to-school-term' into 'master' · fab8ec67
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Link data to school term" Closes #40 See merge request AlekSIS/official/AlekSIS!299
  fab8ec67
- Merge branch '265-dropdown-for-languages' into 'master' · 67863768
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Dropdown for languages" Closes #265 See merge request AlekSIS/official/AlekSIS!295
  67863768
- Apply suggestion to aleksis/core/mixins.py · beeda892
  Jonathan Weth authored 4 years ago
  
  beeda892
- Merge branch 'celery-progress' into 'master' · ce2577c7
  Nik | Klampfradler authored 4 years ago
  
  Add universally usable progress bar for Celery tasks Closes #287 See merge request AlekSIS/official/AlekSIS!304
  ce2577c7
- Merge branch '288-show-guardians-and-children-on-person-view' into 'master' · 997749f6
  Nik | Klampfradler authored 4 years ago
  
  Resolve "Show guardians and children on person view" Closes #288 See merge request AlekSIS/official/AlekSIS!307
  997749f6
Jun 14, 2020
- Add backup title attribute · 8a7a48fa
  Tom Teichler authored 4 years ago
  
  8a7a48fa
- Move import, add tooltip · 36b6d6ba
  Tom Teichler authored 4 years ago
  
  36b6d6ba
Jun 13, 2020
- Update lockfile · e0d603a4
  Tom Teichler authored 4 years ago
  
  e0d603a4
- Show health checks on system status page · 4e7a5619
  Tom Teichler authored 4 years ago
  
  4e7a5619
- Merge branch 'master' into 133-implement-django-health-check · 23c12a46
  Tom Teichler authored 4 years ago
  
  Verified
  
  23c12a46
- Reformat · 38e6974d
  Jonathan Weth authored 4 years ago
  
  Verified
  
  38e6974d
- Merge branch 'master' into 40-link-data-to-school-term · 387335a7
  Jonathan Weth authored 4 years ago
  
  Verified
  
  387335a7
- Rename school year to school term and fix permissions · 53c8a819
  Jonathan Weth authored 4 years ago
  
  Verified
  
  53c8a819
- Merge branch 'master' into 265-dropdown-for-languages · 90aa89e4
  Jonathan Weth authored 4 years ago
  
  Verified
  
  90aa89e4
- Move progress template to pages directory · 3f7037a4
  Jonathan Weth authored 4 years ago
  
  Verified
  
  3f7037a4
- Merge branch 'master' into celery-progress · 2c92422f
  Jonathan Weth authored 4 years ago
  
  Verified
  
  2c92422f
- Show warning and indeterminate progress bar, if JS isn't activated. · c74b02bc
  Jonathan Weth authored 4 years ago
  
  Verified
  
  c74b02bc
- Merge branch 'bugfix/use-django-autodiscover' into 'master' · 94f66037
  Jonathan Weth authored 4 years ago
  
  Use autodiscover code of Django for checks and model extensions See merge request AlekSIS/official/AlekSIS!293
  94f66037
- Merge branch 'bugfix/extensible-model-use-provided-name' into 'master' · 1075db32
  Jonathan Weth authored 4 years ago
  
  Use provided name in ExtensibleModel methods See merge request AlekSIS/official/AlekSIS!306
  1075db32
- Merge branch '246-reorganise-templates' into 'master' · 7af38001
  Jonathan Weth authored 4 years ago
  
  Resolve "Reorganise templates" Closes #246 See merge request AlekSIS!276
  7af38001
- Show guardians and children on person full page · 0fbd61ab
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0fbd61ab
Jun 12, 2020
- Merge branch 'improve-group-views' into 'master' · 89c2a061
  Nik | Klampfradler authored 4 years ago
  
  Improve group views See merge request AlekSIS/official/AlekSIS!303
  89c2a061
- Apply suggestion to aleksis/core/apps.py · 5463661c
  Nik | Klampfradler authored 4 years ago
  
  5463661c
- Use provided name if ExtensibleModel methods · 9b64c41e
  Nik | Klampfradler authored 4 years ago
  
  Verified
  
  9b64c41e
- Delete wrong queryset · d7842202
  Julian authored 4 years ago
  
  d7842202
Jun 11, 2020
- Rename directories · 2c313482
  Tom Teichler authored 4 years ago
  
  Verified
  
  2c313482