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

7f08490b

Verified Commit 7f08490b authored 4 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into 310-test-django-cachalot

parents 590eb0bc aee5dbb0

No related branches found

No related tags found

1 merge request!379Resolve "Test django-cachalot"

Pipeline #4923 passed 4 years ago

Stage: test

Stage: build

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/core/locale/ar/LC_MESSAGES/django.po 2 additions, 2 deletions

aleksis/core/locale/ar/LC_MESSAGES/django.po
aleksis/core/locale/de_DE/LC_MESSAGES/django.po 5 additions, 5 deletions

aleksis/core/locale/de_DE/LC_MESSAGES/django.po
aleksis/core/locale/fr/LC_MESSAGES/django.po 2 additions, 2 deletions

aleksis/core/locale/fr/LC_MESSAGES/django.po
aleksis/core/locale/la/LC_MESSAGES/django.po 2 additions, 2 deletions

aleksis/core/locale/la/LC_MESSAGES/django.po
aleksis/core/locale/nb_NO/LC_MESSAGES/django.po 2 additions, 2 deletions

aleksis/core/locale/nb_NO/LC_MESSAGES/django.po
aleksis/core/locale/tr_TR/LC_MESSAGES/django.po 2 additions, 2 deletions

aleksis/core/locale/tr_TR/LC_MESSAGES/django.po
aleksis/core/static/js/serviceworker.js 7 additions, 19 deletions

aleksis/core/static/js/serviceworker.js
aleksis/core/templates/two_factor/core/setup.html 2 additions, 2 deletions

aleksis/core/templates/two_factor/core/setup.html
aleksis/core/urls.py 1 addition, 0 deletions

aleksis/core/urls.py
aleksis/core/views.py 12 additions, 0 deletions

aleksis/core/views.py

with 37 additions and 36 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