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

Feb 06, 2019
- Merge branch 'dev' into server · def03b50
  Jonathan Weth authored 6 years ago
  
  def03b50
- Materialize JS fix · d5568b8b
  root authored 6 years ago
  
  d5568b8b
Jan 29, 2019
- Update README.md · 3b8f10e0
  Hangzhi Yu authored 6 years ago
  
  3b8f10e0
Jan 24, 2019
- Merge pull request #98 from Katharineum/feature/timetable-fixes · 908bd77a
  Jonathan Weth authored 6 years ago
  
  Fix design problems
  908bd77a
- Fix design problems · 6e8621e4
  Jonathan Weth authored 6 years ago
  
  6e8621e4
- Merge pull request #97 from Katharineum/feature/menu-at-regular-users · 549ef1f0
  Jonathan Weth authored 6 years ago
  
  Show menu entry for menu at regular users (issue #96)
  549ef1f0
- Show menu entry for menu at regular users (issue #96 ) · b6c6a656
  Jonathan Weth authored 6 years ago
  
  b6c6a656
Jan 20, 2019
- Merge branch 'server' of https://github.com/Katharineum/school-apps into server · a434c3cc
  root authored 6 years ago
  
  a434c3cc
- Server migrations · e1858033
  root authored 6 years ago
  
  e1858033
- Update settings.py · be14ee14
  Jonathan Weth authored 6 years ago
  
  be14ee14
- Merge pull request #95 from Katharineum/dev · 3f3c9666
  Jonathan Weth authored 6 years ago
  
  Server
  3f3c9666
- Merge pull request #94 from Katharineum/feature/aebli-beta-changes · 7311e5ce
  Jonathan Weth authored 6 years ago
  
  Feature/aebli beta changes
  7311e5ce
- beta notice (issue #92 ) · 0362abc9
  Jonathan Weth authored 6 years ago
  
  0362abc9
- Impress, data protection (issue #90 ) · 19326574
  Jonathan Weth authored 6 years ago
  
  19326574
- Bug fix in timetable (missing "col s2" div) · fefce4a6
  Jonathan Weth authored 6 years ago
  
  fefce4a6
Jan 18, 2019
- Merge branch 'server' of https://github.com/Katharineum/school-apps into server · cbd74eec
  root authored 6 years ago
  
  cbd74eec
- BASE_DIR bug · 3ad6ed5a
  root authored 6 years ago
  
  3ad6ed5a
- Merge pull request #91 from Katharineum/dev · 2e2ead06
  Jonathan Weth authored 6 years ago
  
  Smart plan to server
  2e2ead06
Jan 10, 2019
- Update README.md · a0960a70
  Jonathan Weth authored 6 years ago
  
  a0960a70
- Update README.md · 29939478
  Jonathan Weth authored 6 years ago
  
  29939478
Jan 08, 2019
- Update README.md · 40831019
  Jonathan Weth authored 6 years ago
  
  40831019
- Merge pull request #89 from Katharineum/feature/badges · f644031b
  Jonathan Weth authored 6 years ago
  
  Redesign badge (issues #84, #78)
  f644031b
- Redesign badge (issues #84 , #78 ) · 957668a1
  Jonathan Weth authored 6 years ago
  
  957668a1
Jan 06, 2019
- Merge pull request #86 from Katharineum/feature/material-form · 97ae0292
  Jonathan Weth authored 6 years ago
  
  Migrate to Materialize
  97ae0292
- Migrate to Materialize · c1269d33
  Jonathan Weth authored 6 years ago
  
  c1269d33
- Merge pull request #85 from Katharineum/feature/admin-links-63 · 027322cc
  Jonathan Weth authored 6 years ago
  
  Add admin links to menu (issue #63)
  027322cc
- Add admin links to menu (issue #63 ) · 0f21384b
  Jonathan Weth authored 6 years ago
  
  0f21384b
- Add migration · eec006c4
  Jonathan Weth authored 6 years ago
  
  eec006c4
- Merge pull request #83 from Katharineum/smartplan · 7046acc7
  Jonathan Weth authored 6 years ago
  
  Smartplan
  7046acc7
- Merge branch 'dev' into smartplan · 3fafc842
  Jonathan Weth authored 6 years ago
  
  3fafc842
- Last bugs · 0ce17fe3
  Jonathan Weth authored 6 years ago
  
  0ce17fe3
Jan 04, 2019
- My plan with bugs > Test with teachers and e/q classes · 03de0329
  Jonathan Weth authored 6 years ago
  
  03de0329
Jan 03, 2019

Navigation arrows, comments, better presentation of week days, add navigation... · 462839c1

Jonathan Weth authored 6 years ago

Navigation arrows, comments, better presentation of week days, add navigation items of smart plan to print mode, remove some margins, remove django material imports in header, add media dir to .gitignore

462839c1

Dec 30, 2018
- Remove bugs in plan | Comment · bef89f75
  Jonathan Weth authored 6 years ago
  
  bef89f75
- Update README.md · d07a580e
  Jonathan Weth authored 6 years ago
  
  d07a580e
Dec 29, 2018
- Working plan with bugs · 717b7c74
  Jonathan Weth authored 6 years ago
  
  717b7c74
Dec 28, 2018
- Update README.md · ef1db788
  Hangzhi Yu authored 6 years ago
  
  ef1db788
Dec 26, 2018
- change icons in menu · a0a9cf84
  Frank Poetzsch-Heffter authored 6 years ago
  
  a0a9cf84
- Merge branch 'feature/aub-delete-52' into dev · 69f76a65
  Frank Poetzsch-Heffter authored 6 years ago
  
  69f76a65
Dec 25, 2018
- update modelform and edit function · d9da508b
  Frank Poetzsch-Heffter authored 6 years ago
  
  d9da508b