Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

d22dc2b1

Verified Commit d22dc2b1 authored 5 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into merge/pwa

# Conflicts:
#	aleksis/core/settings.py
#	poetry.lock
#	pyproject.toml

parents ae1e456d 08ab1f9a

No related branches found

No related tags found

1 merge request!99Add PWA to AlekSIS

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/core/apps.py 3 additions, 2 deletions

aleksis/core/apps.py
aleksis/core/mailer.py 7 additions, 3 deletions

aleksis/core/mailer.py
aleksis/core/menus.py 2 additions, 1 deletion

aleksis/core/menus.py
aleksis/core/models.py 0 additions, 10 deletions

aleksis/core/models.py
aleksis/core/settings.py 22 additions, 2 deletions

aleksis/core/settings.py
aleksis/core/static/theme.scss 2 additions, 2 deletions

aleksis/core/static/theme.scss
aleksis/core/templates/core/base.html 29 additions, 22 deletions

aleksis/core/templates/core/base.html
aleksis/core/urls.py 0 additions, 1 deletion

aleksis/core/urls.py
aleksis/core/util/sass_helpers.py 5 additions, 4 deletions

aleksis/core/util/sass_helpers.py
poetry.lock 33 additions, 18 deletions

poetry.lock
pyproject.toml 1 addition, 1 deletion

pyproject.toml

with 104 additions and 66 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment