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

30552e5f

Verified Commit 30552e5f authored 4 years ago by Tom Teichler

Downloads
- Plain Diff

Merge branch 'master' into 235-serve-as-saml-and-oauth2-provider

parents f401a2ac 57fe7bef

Loading

Checking pipeline status

Changes 13
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 0 deletions

.gitlab-ci.yml
Dockerfile 1 addition, 1 deletion

Dockerfile
aleksis/core/mixins.py 5 additions, 0 deletions

aleksis/core/mixins.py
aleksis/core/settings.py 38 additions, 3 deletions

aleksis/core/settings.py
aleksis/core/templates/core/base.html 1 addition, 0 deletions

aleksis/core/templates/core/base.html
aleksis/core/templates/core/base_print.html 1 addition, 0 deletions

aleksis/core/templates/core/base_print.html
aleksis/core/urls.py 6 additions, 2 deletions

aleksis/core/urls.py
aleksis/core/util/auth_helpers.py 12 additions, 5 deletions

aleksis/core/util/auth_helpers.py
aleksis/core/util/predicates.py 17 additions, 2 deletions

aleksis/core/util/predicates.py
docker-startup.sh 98 additions, 30 deletions

docker-startup.sh
docs/admin/05_storage.rst 23 additions, 0 deletions

docs/admin/05_storage.rst
poetry.lock 266 additions, 28 deletions

poetry.lock
pyproject.toml 5 additions, 2 deletions

pyproject.toml

with 475 additions and 73 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