DGNum/gestioCOF
13
2
Fork 2
Code Issues 82 Pull requests 18 Projects Releases 12 Packages Wiki Activity Actions

Merge branch 'master' into aureplop/site-cof

Browse source
This commit is contained in:
Aurélien Delobelle 2019-01-06 00:56:21 +01:00
commit 84c88dfd5e
37 changed files with 1706 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cof/settings/common.py
View file

@ -68,6 +68,7 @@ INSTALLED_APPS = [
"django.contrib.admin",
"django.contrib.admindocs",
"bda",
"petitscours",
"captcha",
"django_cas_ng",
"bootstrapform",

3
cof/urls.py
View file

@ -21,7 +21,6 @@ from gestioncof.urls import (
clubs_patterns,
events_patterns,
export_patterns,
petitcours_patterns,
surveys_patterns,
)
@ -35,7 +34,7 @@ urlpatterns = [
# Les exports
url(r"^export/", include(export_patterns)),
# Les petits cours
url(r"^petitcours/", include(petitcours_patterns)),
url(r"^petitcours/", include("petitscours.urls")),
# Les sondages
url(r"^survey/", include(surveys_patterns)),
# Evenements