cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'master' into Kerl/fusion_bda

Browse source 
Résolution des conflits :

* Suppression des applis `bda2` et `bda3`
* Choix d'une date arbitraire pour le début du tirage
This commit is contained in:
Martin Pépin 2016-06-03 13:54:57 +02:00 • committed by Martin Pépin
commit e270855823
21 changed files with 375 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cof/urls.py
View file

@ -16,8 +16,8 @@ from gestioncof.petits_cours_views import DemandeListView
urlpatterns = patterns('',
url(r'^$', 'gestioncof.views.home', name = 'home'),
url(r'^cof/denied$', TemplateView.as_view(template_name = 'cof-denied.html'), name = "cof-denied"),
url(r'^cas/login$', 'django_cas.views.login', name = "cas_login_view"),
url(r'^cas/logout$', 'django_cas.views.logout'),
url(r'^cas/login$', 'django_cas_ng.views.login', name = "cas_login_view"),
url(r'^cas/logout$', 'django_cas_ng.views.logout'),
url(r'^outsider/login$', 'gestioncof.views.login_ext'),
url(r'^outsider/logout$', 'django.contrib.auth.views.logout', {'next_page': '/gestion/'}),
url(r'^outsider/password-change$', 'django.contrib.auth.views.password_change'),