DGNum/wiki-eleves
6
0
Fork 0
Code Issues 7 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge branch 'thubrecht/django3' into 'master'

Browse source 
Update to Django 3.2

See merge request klub-dev-ens/WikiENS!18
This commit is contained in:
Basile Clement 2022-12-05 13:57:57 +01:00
commit 25a1b880e5
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
WikiENS/settings/common.py
View file

@ -113,6 +113,7 @@ DATABASES = {
} }
} }
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
# Password validation # Password validation
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators

4
requirements.txt
View file

@ -1,3 +1,3 @@
Django==2.2.* Django==3.2.*
git+https://git.eleves.ens.fr/klub-dev-ens/django-allauth-ens.git@1.1.3 git+https://git.eleves.ens.fr/klub-dev-ens/django-allauth-ens.git@1.1.3
wiki==0.7 wiki==0.7.*

3
shared/templates/wiki/base.html
View file

@ -1,6 +1,5 @@
{% extends "wiki/base_site.html" %} {% extends "wiki/base_site.html" %}
{% load i18n staticfiles %} {% load i18n static sekizai_tags %}
{% load sekizai_tags %}
{% block wiki_site_title %} - WikiENS{% endblock %} {% block wiki_site_title %} - WikiENS{% endblock %}

2
wiki_groups/templates/wiki_groups/list.html
View file

@ -1,5 +1,5 @@
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load staticfiles %} {% load static %}
{% block wiki_site_title %}Groupes - WikiENS{% endblock %} {% block wiki_site_title %}Groupes - WikiENS{% endblock %}