Commits · 47ebe0140ff8f3a2363fa3cb40eee6fe819c0f16 · AlekSIS® / Official / AlekSIS-Core

Mar 25, 2019
- use materialcss method · 47ebe014
  Hangzhi Yu authored 6 years ago
  
  47ebe014
- Merge remote-tracking branch 'origin/pwa-optimized' into pwa-optimized · 334fb024
  Hangzhi Yu authored 6 years ago
  
  334fb024
- Merge branch 'dev' of https://github.com/Katharineum/school-apps into dev · ba52978b
  Hangzhi Yu authored 6 years ago
  
  # Conflicts: # .idea/misc.xml # .idea/school-apps.iml
  ba52978b
- comments · 9a0a461a
  Hangzhi Yu authored 6 years ago
  
  9a0a461a
- comments · 7d862bdd
  Hangzhi Yu authored 6 years ago
  
  7d862bdd
Mar 24, 2019
- Update README.md · 546f443e
  Hangzhi Yu authored 6 years ago
  
  546f443e
- optimize plan and smart plan for mobile devices using django_user-agents · 04f155e7
  Hangzhi Yu authored 6 years ago
  
  04f155e7
- Merge pull request #144 from Katharineum/pwa-optimized · ffc661cb
  Jonathan Weth authored 6 years ago
  
  merge into dev
  ffc661cb
- Merge branch 'dev' into pwa-optimized · d27c7117
  Jonathan Weth authored 6 years ago
  
  d27c7117
- Don't show substitutions with "N" (don't print) flag (issue #118 ) · 94e1bfc1
  Jonathan Weth authored 6 years ago
  
  94e1bfc1
- Merge pull request #154 from Katharineum/feature/top-box-sub · 90b6bf87
  Jonathan Weth authored 6 years ago
  
  Show missing teachers (absences) in the header PDF
  90b6bf87
- Merge branch 'dev' into feature/top-box-sub · 599e05cd
  Jonathan Weth authored 6 years ago
  
  599e05cd
- Merge branch 'dev' into pwa-optimized · a50ac3b5
  Jonathan Weth authored 6 years ago
  
  a50ac3b5
Mar 19, 2019
- configure interpreter python-3.7 · f2f63626
  Frank Poetzsch-Heffter authored 6 years ago
  
  f2f63626
- Merge branch 'feature/AUB-edit-id-bug' into dev · ae743db5
  Frank Poetzsch-Heffter authored 6 years ago
  
  ae743db5
- fixed edit id bug · caf8f8ee
  Frank Poetzsch-Heffter authored 6 years ago
  
  caf8f8ee
Mar 18, 2019
- Merge pull request #152 from Katharineum/feature/merge-2-sub-pdfs · a54ffb39
  Jonathan Weth authored 6 years ago
  
  Feature/merge 2 sub pdfs #149
  a54ffb39
- Show two days in PDF (issue #134 ) · 875a90d1
  Jonathan Weth authored 6 years ago
  
  875a90d1
- Merge branch 'feature/merge-2-sub-pdfs' of github.com:Katharineum/school-apps... · 9334b0aa
  Jonathan Weth authored 6 years ago
  
  Merge branch 'feature/merge-2-sub-pdfs' of github.com:Katharineum/school-apps into feature/merge-2-sub-pdfs
  9334b0aa
- Comment LaTeX · 516f922f
  Jonathan Weth authored 6 years ago
  
  516f922f
- Merge pull request #151 from Katharineum/server · ad935b35
  Jonathan Weth authored 6 years ago
  
  Some bug fixes
  ad935b35
- Resolve and merge migrations · 2c470cdd
  Jonathan Weth authored 6 years ago
  
  2c470cdd
- Merge pull request #150 from Katharineum/server · 52141849
  Jonathan Weth authored 6 years ago
  
  Server to dev
  52141849
- Some bug fixes · ddf78f5e
  root authored 6 years ago
  
  ddf78f5e
- Merge branch 'server' of github.com:Katharineum/school-apps into server · de011f3f
  Jonathan Weth authored 6 years ago
  
  de011f3f
- Fix file paths in PDF · 490255f0
  Jonathan Weth authored 6 years ago
  
  490255f0
Mar 17, 2019
- Fix bug in PDF on server (issue · 7b81c5a2
  root authored 6 years ago
  
  #106
  7b81c5a2
- Update footer (issue #149 ) · 76faa32e
  Jonathan Weth authored 6 years ago
  
  76faa32e
- Fix design at REBUS (issue #146 ) · 0e15a3cc
  Jonathan Weth authored 6 years ago
  
  0e15a3cc
- Show missing teachers (absences) in the header PDF · 90d5c378
  Jonathan Weth authored 6 years ago
  
  90d5c378
Mar 16, 2019
- mirgrations-011 · 2f8cf498
  Frank Poetzsch-Heffter authored 6 years ago
  
  2f8cf498
- check1 deny notification · 058ebe13
  Frank Poetzsch-Heffter authored 6 years ago
  
  058ebe13
Mar 13, 2019
- Merge pull request #148 from Katharineum/dev · fa974e4e
  Jonathan Weth authored 6 years ago
  
  Dev to server
  fa974e4e
- Repair migrations · 74d4c98a
  root authored 6 years ago
  
  74d4c98a
- add from_time and to_time to notification · a3fa2c5d
  Frank Poetzsch-Heffter authored 6 years ago
  
  a3fa2c5d
- vcs-status · 86ebae68
  Frank Poetzsch-Heffter authored 6 years ago
  
  86ebae68
Mar 11, 2019
- migrations for aub · a1173137
  Frank Poetzsch-Heffter authored 6 years ago
  
  a1173137
- update material icons · 447eb3a2
  Hangzhi Yu authored 6 years ago
  
  447eb3a2
Mar 10, 2019
- Merge pull request #142 from Katharineum/dev · a45da26e
  Jonathan Weth authored 6 years ago
  
  Dev to server
  a45da26e
- Merge pull request #141 from Katharineum/server · 00fe2ff7
  Jonathan Weth authored 6 years ago
  
  Server
  00fe2ff7