Resolve "Make Alsijil work with current core" (!43) · Merge requests · AlekSIS® / Official / AlekSIS-App-Alsijil · GitLab

Snippets Groups Projects

Merged Tom Teichler requested to merge 60-make-alsijil-work-with-current-core into master 4 years ago

Jun 13, 2020
- Merge branch 'master' into 60-make-alsijil-work-with-current-core · f7597d17
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f7597d17
- Use SchoolTerm instead of SchoolYear and catch non-existing school term · e6b86387
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e6b86387
Jun 12, 2020
- 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
- Use PEP8 formatting · f005a767
  Julian authored 4 years ago
  
  f005a767
- Simplify comparison · 029a65ab
  Julian authored 4 years ago
  
  029a65ab
- Clear fixme, use SchoolYear model · 24fcf2c2
  Julian authored 4 years ago
  
  24fcf2c2
- Rename annotation · 94d5efbf
  Julian authored 4 years ago
  
  94d5efbf
Jun 01, 2020

Merge branch '60-make-alsijil-work-with-current-core-fixes' into... · 5f16cb3c

Nik | Klampfradler authored 4 years ago

Merge branch '60-make-alsijil-work-with-current-core-fixes' into '60-make-alsijil-work-with-current-core'

Fix week view code

See merge request !46

5f16cb3c

May 31, 2020
- Merge remote-tracking branch 'origin/master' into 60-make-alsijil-work-with-current-core-fixes · 7eba57d9
  Jonathan Weth authored 4 years ago
  
  Verified
  
  7eba57d9
- Fix week view code · 4da81bd8
  Jonathan Weth authored 4 years ago
  
  - Fix select form - Fix names - Fix URLs
  Verified
  
  4da81bd8
May 29, 2020
- Add verbose names to models · 78bc4525
  Tom Teichler authored 4 years ago
  
  Verified
  
  78bc4525
- Merge branch 'master' into 60-make-alsijil-work-with-current-core · 91804534
  Tom Teichler authored 4 years ago
  
  Verified
  
  91804534
May 11, 2020
- Remove non-existing decorators · 684c19f0
  Tom Teichler authored 4 years ago
  
  Verified
  
  684c19f0
- Use ExtensibleModel · 7d31b655
  Tom Teichler authored 4 years ago
  
  Verified
  
  7d31b655
- Re-create migrations · 3d1904c1
  Tom Teichler authored 4 years ago
  
  Verified
  
  3d1904c1
- Fix apps.py · bfe3e56e
  Tom Teichler authored 4 years ago
  
  Verified
  
  bfe3e56e
- Sort imports · 46ed36f7
  Tom Teichler authored 4 years ago
  
  Verified
  
  46ed36f7
- Update dependencies · d7a1eaa0
  Tom Teichler authored 4 years ago
  
  Verified
  
  d7a1eaa0