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

Merge branch 'master' into aureplop/kpsul_js_refactor

Browse source 
Not chill.
This commit is contained in:
Aurélien Delobelle 2017-04-04 00:51:49 +02:00
commit 9d2298a089
173 changed files with 39741 additions and 16936 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cof/urls.py
View file

@ -4,10 +4,6 @@
Fichier principal de configuration des urls du projet GestioCOF
"""
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import autocomplete_light
from django.conf import settings
@ -63,7 +59,8 @@ urlpatterns = [
name='password_change_done'),
# Inscription d'un nouveau membre
url(r'^registration$', gestioncof_views.registration),
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$',
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)/'
r'(?P<fullname>.*)$',
gestioncof_views.registration_form2, name="clipper-registration"),
url(r'^registration/user/(?P<username>.+)$',
gestioncof_views.registration_form2, name="user-registration"),