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

1af84364

Verified Commit 1af84364 authored 4 years ago by Tom Teichler

Downloads
- Plain Diff

Merge branch 'master' into 331-user-registration

parents a50309a4 b528d806

No related branches found

No related tags found

1 merge request!413Resolve "User registration"

Checking pipeline status

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/core/mixins.py 8 additions, 0 deletions

aleksis/core/mixins.py
aleksis/core/models.py 3 additions, 3 deletions

aleksis/core/models.py
aleksis/core/preferences.py 3 additions, 0 deletions

aleksis/core/preferences.py
aleksis/core/settings.py 8 additions, 1 deletion

aleksis/core/settings.py
aleksis/core/static/js/main.js 5 additions, 0 deletions

aleksis/core/static/js/main.js
aleksis/core/static/style.scss 5 additions, 0 deletions

aleksis/core/static/style.scss
aleksis/core/templates/dynamic_preferences/form.html 2 additions, 0 deletions

aleksis/core/templates/dynamic_preferences/form.html
aleksis/core/templates/material/fields/colorfield_colorwidget.html 32 additions, 0 deletions

...ore/templates/material/fields/colorfield_colorwidget.html
aleksis/core/templatetags/dashboard.py 4 additions, 3 deletions

aleksis/core/templatetags/dashboard.py
aleksis/core/util/ldap.py 34 additions, 0 deletions

aleksis/core/util/ldap.py

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