Review: Approve Just 1 nit and a few typos. Feel free to merge and deploy straight away after fixing.
Diff comments: > === modified file 'local_settings.py.sample' > --- local_settings.py.sample 2018-11-26 19:10:39 +0000 > +++ local_settings.py.sample 2019-03-06 08:13:58 +0000 > @@ -37,10 +37,9 @@ > } > } > > -# The following are just dummy values, but needed defined > -# To use the registration you have to create an API key pair > -# See https://developers.google.com/recaptcha/docs/start > -# You have to use 'localhost' as Domain > +# If you want to test the registration, you will need this keys. For testing this -> these > +# purposes, grab the values from: > +# > https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha-v2-what-should-i-do > NORECAPTCHA_SITE_KEY = 'dummy' > NORECAPTCHA_SECRET_KEY = 'dummy' > > > === modified file 'pip_requirements.txt' > --- pip_requirements.txt 2018-11-19 17:19:29 +0000 > +++ pip_requirements.txt 2019-03-06 08:13:58 +0000 > @@ -1,45 +1,48 @@ > # Python requirements for widelands-website at 22.06.2017 > > -beautifulsoup4==4.6.3 > -Django==1.11.12 > +beautifulsoup4==4.7.1 > +bleach==3.1.0 > +Django==1.11.20 > django-haystack==2.8.1 > # django-messages is very old on pypi > # Do not install newer versions because our notifications app is affected > -e > git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages > -django-nocaptcha-recaptcha==0.0.19 > +django-nocaptcha-recaptcha==0.0.20 > django-star-ratings==0.7.0 > -dj-pagination==2.3.2 > -django-registration==2.4.1 > -django-tagging==0.4.5 > -gunicorn==19.7.1 > -lxml==4.2.5 > -Markdown==2.6.8 > -mysqlclient==1.3.10 > -numpy==1.13.0 > -Pillow==4.1.1 > -pydot==1.2.3 > -pyparsing==2.2.0 > -Sphinx==1.6.2 > +dj-pagination==2.4.0 > +django-registration==3.0 > +django-tagging==0.4.6 > +gunicorn==19.9.0 > +lxml==4.3.2 > +Markdown==3.0.1 > +mysqlclient==1.4.2.post1 > +numpy==1.16.2 > +Pillow==5.4.1 > +pydot==1.4.1 > +pyparsing==2.3.1 > +Sphinx==1.8.4 > untokenize==0.1.1 > -bleach==2.0.0 > Whoosh==2.7.4 > > -# Dependencies for Sphinx (automatically installed): > -# snowballstemmer==1.2.1 > -# alabaster==0.7.10 > -# sphinxcontrib-websupport==1.0.1 > -# Pygments==2.2.0 > -# requests==2.18.1, installs: idna, urllib3, chardet, certifi > -# Babel==2.4.0, installs: pytz > -# docutils==0.13.1 > -# Jinja2==2.9.6, installs: MarkupSafe > -# typing==3.6.1 > -# imagesize==0.7.1 > -# six==1.10.0 > - > -# Dependencies for bleach (automatically installed): > -# six > -# html5lib==0.999999999, installs: six, setuptools, webencodings > - > -# Dependencies for Pillow (automatically installed): > -# olefile==0.44 > +# Automatically installed dependencies > +# Dependencies for django-regitration: regitration -> registration > + # confusable-homoglyphs=3.0 > +# Dependencies for Sphinx: > + # snowballstemmer==1.2.1 > + # alabaster==0.7.10 > + # sphinxcontrib-websupport==1.0.1 > + # Pygments==2.2.0 > + # requests==2.18.1, installs: idna, urllib3, chardet, certifi > + # Babel==2.4.0, installs: pytz > + # docutils==0.13.1 > + # Jinja2==2.9.6, installs: MarkupSafe > + # typing==3.6.1 > + # imagesize==0.7.1 > + # six==1.10.0 > + # packaging==19.0 > + > +# Depencies for beautifulsoup: > + # soupsieve==1.8, installs backports.functools-lru-cache > + > +# Dependencies for bleach: > + # six > > === modified file 'templates/django_registration/registration_complete.html' > --- templates/registration/registration_complete.html 2018-10-14 13:24:15 > +0000 > +++ templates/django_registration/registration_complete.html 2019-03-06 > 08:13:58 +0000 > @@ -1,4 +1,4 @@ > -{% extends "registration/base.html" %} > +{% extends "base.html" %} We have mainpage/base.html above - should this be consistent? > {% comment %} > vim:ft=htmldjango: > {% endcomment %} -- https://code.launchpad.net/~widelands-dev/widelands-website/update_third_party_apps/+merge/364024 Your team Widelands Developers is subscribed to branch lp:widelands-website. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
