Merge branch 'master' into '75-migrate-to-django-3-0'
# Conflicts: # poetry.lock
No related branches found
No related tags found
Checking pipeline status
Showing
- .gitlab-ci.yml 66 additions, 16 deletions.gitlab-ci.yml
- CONTRIBUTING.rst 21 additions, 0 deletionsCONTRIBUTING.rst
- Dockerfile 13 additions, 15 deletionsDockerfile
- apps/official/BiscuIT-App-Alsijil 1 addition, 1 deletionapps/official/BiscuIT-App-Alsijil
- apps/official/BiscuIT-App-Chronos 1 addition, 1 deletionapps/official/BiscuIT-App-Chronos
- apps/official/BiscuIT-App-Exlibris 1 addition, 1 deletionapps/official/BiscuIT-App-Exlibris
- biscuit/core/menus.py 0 additions, 10 deletionsbiscuit/core/menus.py
- biscuit/core/migrations/0006_create_superuser.py 26 additions, 0 deletionsbiscuit/core/migrations/0006_create_superuser.py
- biscuit/core/migrations/0007_unlink_school_schoolterm.py 31 additions, 0 deletionsbiscuit/core/migrations/0007_unlink_school_schoolterm.py
- biscuit/core/models.py 10 additions, 1 deletionbiscuit/core/models.py
- biscuit/core/settings.py 4 additions, 3 deletionsbiscuit/core/settings.py
- biscuit/core/templates/contact_form/contact_form.html 0 additions, 17 deletionsbiscuit/core/templates/contact_form/contact_form.html
- biscuit/core/templates/contact_form/contact_form.txt 0 additions, 3 deletionsbiscuit/core/templates/contact_form/contact_form.txt
- biscuit/core/templates/contact_form/contact_form_sent.html 0 additions, 13 deletionsbiscuit/core/templates/contact_form/contact_form_sent.html
- biscuit/core/templates/contact_form/contact_form_subject.txt 0 additions, 1 deletionbiscuit/core/templates/contact_form/contact_form_subject.txt
- biscuit/core/tests/browser/test_selenium.py 57 additions, 0 deletionsbiscuit/core/tests/browser/test_selenium.py
- biscuit/core/urls.py 0 additions, 1 deletionbiscuit/core/urls.py
- biscuit/core/util/core_helpers.py 14 additions, 0 deletionsbiscuit/core/util/core_helpers.py
- docker-compose.yml 1 addition, 0 deletionsdocker-compose.yml
- docker/entrypoint.sh 1 addition, 0 deletionsdocker/entrypoint.sh
Loading
Please register or sign in to comment