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

630b4896

Commit 630b4896 authored 2 years ago by Tom Teichler

Downloads
- Plain Diff

Merge branch 'master' into 711-3-0-move-room-from-chronos-to-core

parents fb77b883 092963f4

No related branches found

No related tags found

1 merge request!1113Resolve "[3.0] Move Room from Chronos to Core"

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 6 additions, 0 deletions

CHANGELOG.rst
aleksis/core/__init__.py 0 additions, 2 deletions

aleksis/core/__init__.py
aleksis/core/mixins.py 4 additions, 4 deletions

aleksis/core/mixins.py
aleksis/core/settings.py 12 additions, 11 deletions

aleksis/core/settings.py
aleksis/core/templates/core/base.html 0 additions, 3 deletions

aleksis/core/templates/core/base.html
aleksis/core/templates/core/vue_base.html 0 additions, 3 deletions

aleksis/core/templates/core/vue_base.html
aleksis/core/urls.py 0 additions, 2 deletions

aleksis/core/urls.py
aleksis/core/util/apps.py 5 additions, 0 deletions

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

aleksis/core/views.py
pyproject.toml 4 additions, 5 deletions

pyproject.toml

with 33 additions and 33 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