From ce7104a331facb63ab49353a9aba70a419c9467b Mon Sep 17 00:00:00 2001 From: Qwann Date: Thu, 22 Mar 2018 12:49:25 +0100 Subject: [PATCH 1/4] LTS is good --- requirement.txt | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/requirement.txt b/requirement.txt index 4f9c423..c7361f6 100644 --- a/requirement.txt +++ b/requirement.txt @@ -1,14 +1,40 @@ bleach==1.5.0 -Django==1.10.7 +certifi==2018.1.18 +chardet==3.0.4 +decorator==4.2.1 +defusedxml==0.5.0 +Django==1.11 +django-allauth==0.35.0 +django-allauth-cas==1.0.0b2 +django-allauth-ens==1.0.0b2 django-classy-tags==0.8.0 django-mptt==0.8.7 -django-nyt==1.0b5 +django-nyt==1.0 django-sekizai==0.10.0 +django-widget-tweaks==1.4.1 html5lib==0.9999999 -Markdown==2.6.8 -olefile==0.44 -Pillow==4.2.1 -six==1.10.0 -sorl-thumbnail==12.3 -wiki==0.2.4 -django-allauth-ens==1.0.0b2 +idna==2.6 +ipython==6.2.1 +ipython-genutils==0.2.0 +jedi==0.11.1 +Markdown==2.6.11 +oauthlib==2.0.7 +parso==0.1.1 +pexpect==4.4.0 +pickleshare==0.7.4 +Pillow==5.0.0 +prompt-toolkit==1.0.15 +ptyprocess==0.5.2 +Pygments==2.2.0 +python-cas==1.2.0 +python3-openid==3.1.0 +pytz==2018.3 +requests==2.18.4 +requests-oauthlib==0.8.0 +simplegeneric==0.8.1 +six==1.11.0 +sorl-thumbnail==12.4.1 +traitlets==4.3.2 +urllib3==1.22 +wcwidth==0.1.7 +wiki==0.3.1 From 6463e3ab23da3a823931274d00271dcb38e74c7a Mon Sep 17 00:00:00 2001 From: Qwann Date: Mon, 26 Mar 2018 14:25:09 +0200 Subject: [PATCH 2/4] less is more --- requirement.txt | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/requirement.txt b/requirement.txt index c7361f6..3d984f4 100644 --- a/requirement.txt +++ b/requirement.txt @@ -1,40 +1,3 @@ -bleach==1.5.0 -certifi==2018.1.18 -chardet==3.0.4 -decorator==4.2.1 -defusedxml==0.5.0 Django==1.11 -django-allauth==0.35.0 -django-allauth-cas==1.0.0b2 django-allauth-ens==1.0.0b2 -django-classy-tags==0.8.0 -django-mptt==0.8.7 -django-nyt==1.0 -django-sekizai==0.10.0 -django-widget-tweaks==1.4.1 -html5lib==0.9999999 -idna==2.6 -ipython==6.2.1 -ipython-genutils==0.2.0 -jedi==0.11.1 -Markdown==2.6.11 -oauthlib==2.0.7 -parso==0.1.1 -pexpect==4.4.0 -pickleshare==0.7.4 -Pillow==5.0.0 -prompt-toolkit==1.0.15 -ptyprocess==0.5.2 -Pygments==2.2.0 -python-cas==1.2.0 -python3-openid==3.1.0 -pytz==2018.3 -requests==2.18.4 -requests-oauthlib==0.8.0 -simplegeneric==0.8.1 -six==1.11.0 -sorl-thumbnail==12.4.1 -traitlets==4.3.2 -urllib3==1.22 -wcwidth==0.1.7 wiki==0.3.1 From 6262fc689ab08b7ef85d6c5983b600c2ad2b4224 Mon Sep 17 00:00:00 2001 From: Qwann Date: Wed, 28 Mar 2018 19:32:40 +0200 Subject: [PATCH 3/4] using dev version of authens --- requirement.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirement.txt b/requirement.txt index 3d984f4..ee65b51 100644 --- a/requirement.txt +++ b/requirement.txt @@ -1,3 +1,4 @@ Django==1.11 -django-allauth-ens==1.0.0b2 +# django-allauth-ens==1.0.0b2 +git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens.git@Qwann/small_fixes wiki==0.3.1 From 40367d5fe9483c5c5b8d0aad175c898aa53e9260 Mon Sep 17 00:00:00 2001 From: Qwann Date: Thu, 29 Mar 2018 19:26:45 +0200 Subject: [PATCH 4/4] fix login url, bump django --- WikiENS/settings.py | 2 +- requirement.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WikiENS/settings.py b/WikiENS/settings.py index 25a083a..a62a6db 100644 --- a/WikiENS/settings.py +++ b/WikiENS/settings.py @@ -166,7 +166,7 @@ SOCIALACCOUNT_ADAPTER = 'shared.allauth_adapter.SocialAccountAdapter' HOME_URL = reverse_lazy('wiki:root') -LOGIN_URL = '_profil/login/' +LOGIN_URL = '/_profil/login/' LOGIN_REDIRECT_URL = HOME_URL ACCOUNT_LOGOUT_REDIRECT_URL = HOME_URL diff --git a/requirement.txt b/requirement.txt index ee65b51..ecfb1af 100644 --- a/requirement.txt +++ b/requirement.txt @@ -1,4 +1,4 @@ -Django==1.11 +Django==1.11.* # django-allauth-ens==1.0.0b2 git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens.git@Qwann/small_fixes wiki==0.3.1