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

bd3fb8ad

Commit bd3fb8ad authored 3 years ago by Nik | Klampfradler

Downloads
- Plain Diff

Merge branch 'master' into 'feature/scheduled-notifications'

# Conflicts:
#   CHANGELOG.rst
#   aleksis/core/models.py

parents df7a51c2 188fce02

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 1 addition, 0 deletions

CHANGELOG.rst
aleksis/core/migrations/0037_add_static_content_widget.py 27 additions, 0 deletions

aleksis/core/migrations/0037_add_static_content_widget.py
aleksis/core/models.py 14 additions, 0 deletions

aleksis/core/models.py
aleksis/core/templates/core/dashboard_widget/static_content_widget.html 10 additions, 0 deletions

...emplates/core/dashboard_widget/static_content_widget.html
docs/admin/10_install.rst 0 additions, 1 deletion

docs/admin/10_install.rst
docs/admin/32_tasks.rst 2 additions, 0 deletions

docs/admin/32_tasks.rst
docs/admin/50_dashboard.rst 8 additions, 0 deletions

docs/admin/50_dashboard.rst
docs/dev/06_merging_app_settings.rst 1 addition, 0 deletions

docs/dev/06_merging_app_settings.rst

with 63 additions and 1 deletion

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