Commits · 1e1927b1c889b0493614d294df8c143257158720 · AlekSIS® / Official / AlekSIS-Core

Nov 30, 2019
- Merge branch 'dev' into dev-1.1.1 · 1e1927b1
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # schoolapps/static/common/style.css
  1e1927b1
Nov 26, 2019
- Change version number to 1.1 · d1a02168
  Jonathan Weth authored 5 years ago
  
  d1a02168
- Merge pull request #319 from Katharineum/merge/dashboard-cache · 6942d316
  Jonathan Weth authored 5 years ago
  
  Merge/dashboard cache
  6942d316
- Merge · 7e63a041
  Jonathan Weth authored 5 years ago
  
  7e63a041
- Merge branch 'dev' into merge/dashboard-cache · 76e0dab6
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # .idea/misc.xml # requirements.txt # schoolapps/dashboard/urls.py # schoolapps/dashboard/views.py # schoolapps/schoolapps/settings.py # schoolapps/schoolapps/urls.py # schoolapps/templates/partials/header.html # schoolapps/timetable/views.py
  76e0dab6
Nov 25, 2019
- Merge pull request #318 from Katharineum/dependabot/npm_and_yarn/dynselect2/mixin-deep-1.3.2 · 4e55a020
  Jonathan Weth authored 5 years ago
  
  Bump mixin-deep from 1.3.1 to 1.3.2 in /dynselect2
  4e55a020
- Bump mixin-deep from 1.3.1 to 1.3.2 in /dynselect2 · 54565408
  dependabot[bot] authored 5 years ago
  
  Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2 ) Signed-off-by: dependabot[bot] <support@github.com>
  54565408
- Merge pull request #309 from Katharineum/feature/pwa-optimization · 1cfe4b42
  Jonathan Weth authored 5 years ago
  
  Feature/pwa optimization
  1cfe4b42
- Changes · aa45b7e3
  Jonathan Weth authored 5 years ago
  
  aa45b7e3
- Merge remote-tracking branch 'origin/feature/pwa-optimization' into feature/pwa-optimization · 04d36bd4
  Jonathan Weth authored 5 years ago
  
  04d36bd4
- Merge branch 'dev' into feature/pwa-optimization · 3b9d7034
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # schoolapps/dashboard/views.py # schoolapps/schoolapps/settings.py # schoolapps/schoolapps/urls.py # schoolapps/templates/common/404.html
  3b9d7034
- Merge pull request #316 from Katharineum/bugfix/show-logged-in-notice-again · 1425d8f8
  Julian authored 5 years ago
  
  Bugfix/show logged in notice again
  1425d8f8
- Show "logged in as" again (issue #310 ) · 0f2de7fa
  Jonathan Weth authored 5 years ago
  
  0f2de7fa
- Change debug level · 71a2753c
  Jonathan Weth authored 5 years ago
  
  71a2753c
Nov 20, 2019
- Merge pull request #314 from Katharineum/bugfix/404 · 7700439e
  Jonathan Weth authored 5 years ago
  
  Bugfix/404
  7700439e
- gitignore logs · 691d4329
  Julian authored 5 years ago
  
  691d4329
- FINALLY FIX THAT STUPID 404 PROBLEM · 87ee6f30
  Julian authored 5 years ago
  
  87ee6f30
- reformat urls · 9886cbc5
  Julian authored 5 years ago
  
  9886cbc5
- reformat settings · cd0463c0
  Julian authored 5 years ago
  
  cd0463c0
Nov 18, 2019
- Fix some bugs with too early imports · d5a4dd2d
  Jonathan Weth authored 5 years ago
  
  d5a4dd2d
Nov 15, 2019
- Change some files in project home like COPYRIGHT, etc. · 0b99e445
  Jonathan Weth authored 5 years ago
  
  0b99e445
- Small bug fix · 50e0508d
  Jonathan Weth authored 5 years ago
  
  50e0508d
Nov 14, 2019
- Merge cache and dashboard · 6e522798
  Jonathan Weth authored 5 years ago
  
  6e522798
- Merge branch 'feature/performance-cache-timetable' into merge/dashboard-cache · de7b0ca3
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # requirements.txt # schoolapps/dashboard/urls.py # schoolapps/dashboard/views.py # schoolapps/helper.py # schoolapps/timetable/views.py # schoolapps/untisconnect/parse.py # schoolapps/untisconnect/plan.py
  de7b0ca3
- - Add holidays · fcc2f44f
  Jonathan Weth authored 5 years ago
  
  - Check "show_plan" permission in dashboard
  fcc2f44f
- Update settings.py · 140287d9
  Jonathan Weth authored 5 years ago
  
  140287d9
- Change offline notice · 949b260a
  Jonathan Weth authored 5 years ago
  
  949b260a
- change pwa config · 1b02a8f2
  Hangzhi Yu authored 5 years ago
  
  1b02a8f2
Nov 13, 2019
- change pwa config · 34a97568
  Hangzhi Yu authored 5 years ago
  
  34a97568
- change pwa config · 14d3565b
  Hangzhi Yu authored 5 years ago
  
  14d3565b
- Merge pull request #312 from Katharineum/feature/pwa-optimization · 5f3cfe88
  Hangzhi Yu authored 5 years ago
  
  Feature/pwa optimization
  5f3cfe88
- Merge branch 'dev-copy' into feature/pwa-optimization · 7dfd0252
  Hangzhi Yu authored 5 years ago
  
  7dfd0252
- add django-pwa to requirements.txt · 47d1b3f8
  Hangzhi Yu authored 5 years ago
  
  47d1b3f8
- Merge remote-tracking branch 'origin/dev-1.1' into feature/pwa-optimization · d0fb0c91
  Hangzhi Yu authored 5 years ago
  
  d0fb0c91
- Merge pull request #311 from Katharineum/dev-1.1 · 21b5ced7
  Jonathan Weth authored 5 years ago
  
  Dev 1.1
  21b5ced7
- Merge branch 'dev' into dev-1.1 · c38a6554
  Jonathan Weth authored 5 years ago
  
  c38a6554
- - Merge dev into feature/dashboard · 047778a1
  Jonathan Weth authored 5 years ago
  
  - Do some refactoring
  047778a1
- Merge branch 'dev' into feature/dashboard · 9b54d2b6
  Jonathan Weth authored 5 years ago
  
  # Conflicts: # schoolapps/dashboard/views.py # schoolapps/static/common/style.css # schoolapps/templates/partials/footer.html # schoolapps/timetable/views.py
  9b54d2b6
- - Some changes · 7afc1a07
  Jonathan Weth authored 5 years ago
  
  7afc1a07
Nov 11, 2019
- Merge pull request #292 from Katharineum/feature/several-days-in-one-tex-document-#288 · 726ab399
  Jonathan Weth authored 5 years ago
  
  Feature/several days in one tex document #288
  726ab399