Merge branch 'master' into qwann/move_user

provisioning/bootstrap.sh

@@ -37,6 +37,7 @@ chown vagrant: ~vagrant/.bash_profile
 cd /vagrant
 
 # Installation des dépendances python
+sudo -H pip3 install -U pip
 sudo -H -u vagrant pip3 install --user -r requirements.txt 
 sudo -H -u vagrant pip3 install --user -r requirements-devel.txt
 

requirements.txt

@@ -1,4 +1,4 @@
-Django==1.10
+Django==1.10.*
 Pillow==3.3.0
 psycopg2==2.6.2
 django-bootstrap-form==3.2.1

users/models.py

@@ -1,3 +1,2 @@
 from django.db import models
 from django.contrib.auth.models import User
-

users/urls.py

@@ -53,11 +53,14 @@ urlpatterns = [
             Home.as_view(),
             name='password_reset_done'),
         # PASS RESET CONFIRM
-        url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 
+        url('^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
+            '(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
             auth_views.password_reset_confirm,
             {
-             'template_name': 'users/user_form.html',
-             'post_reset_redirect': reverse_lazy('user:password_reset_complete'),
+             'template_name': 'user/user_form.html',
+             'post_reset_redirect': reverse_lazy(
+                 'user:password_reset_complete'
+             ),
              'extra_context': {
                  'page_title': 'Changer de mot de passe',
                  'button': 'Changer'