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

c7573f6c

Verified Commit c7573f6c authored 4 years ago by Tom Teichler

Downloads
- Plain Diff

Merge branch 'master' into 223-add-overview-page-for-celery-task-results

parents b27f2321 c04d7806

No related branches found

No related tags found

1 merge request!281Resolve "Add overview page for celery task results"

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 5 additions, 0 deletions

.gitignore
.gitlab-ci.yml 1 addition, 19 deletions

.gitlab-ci.yml
CONTRIBUTING.rst 1 addition, 1 deletion

CONTRIBUTING.rst
aleksis/core/templates/core/crud_events.html 35 additions, 22 deletions

aleksis/core/templates/core/crud_events.html
aleksis/core/templates/templated_email/notification.email 33 additions, 6 deletions

aleksis/core/templates/templated_email/notification.email
aleksis/core/templatetags/data_helpers.py 24 additions, 1 deletion

aleksis/core/templatetags/data_helpers.py
aleksis/core/tests/models/test_notification.py 34 additions, 0 deletions

aleksis/core/tests/models/test_notification.py
aleksis/core/tests/templatetags/test_data_helpers.py 28 additions, 1 deletion

aleksis/core/tests/templatetags/test_data_helpers.py
aleksis/core/util/notifications.py 5 additions, 5 deletions

aleksis/core/util/notifications.py
aleksis/core/util/predicates.py 6 additions, 0 deletions

aleksis/core/util/predicates.py
ci/build_docker.yml 1 addition, 3 deletions

ci/build_docker.yml
ci/general.yml 20 additions, 0 deletions

ci/general.yml
poetry.lock 10 additions, 14 deletions

poetry.lock
pyproject.toml 3 additions, 3 deletions

pyproject.toml

with 206 additions and 75 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