From bbb0db49f00a23695ea5814b7e675dcec5601060 Mon Sep 17 00:00:00 2001 From: Michael Gecht Date: Wed, 7 Jun 2017 16:10:28 +0200 Subject: [PATCH] Update Django to 1.11 and fix django-bootstrap3-datetimepicker-2 error --- requirements/base.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 79ce8b2..fa9d2d4 100755 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # Bleeding edge Django -django==1.10.3 +django==1.11.2 # Configuration django-environ==0.4.3 @@ -31,7 +31,8 @@ pytz==2017.2 # Your custom requirements go here django-bootstrap-breadcrumbs==0.8.2 django-bootstrap3==8.2.3 -django-bootstrap3-datetimepicker-2==2.4.2 +#django-bootstrap3-datetimepicker-2==2.4.2 +git+git://github.com/blag/django-bootstrap3-datetimepicker.git@f8a78b231b75c331c143d5461456f663827a8af6 reportlab==3.4.0 lxml==3.8.0 @@ -39,4 +40,4 @@ django-recaptcha==1.3.0 django-taggit==0.22.1 # Collaboratory translations -django-rosetta==0.7.13 \ No newline at end of file +django-rosetta==0.7.13