Merge branch 'develop' into feature/rules

requirements.txt

@@ -1,215 +1,138 @@
-amqp==2.4.2
+amqp==2.5.2
-apipkg==1.5
+anytree==2.8.0
+apparmor==2.13.3
 appdirs==1.4.3
-arcgis==1.6.0
+asn1crypto==1.3.0
-arrow==0.13.1
+attrs==19.3.0
-asn1crypto==0.24.0
-atomicwrites==1.3.0
-attrs==19.1.0
 backcall==0.1.0
-beautifulsoup4==4.7.1
+beautifulsoup4==4.8.2
-billiard==3.6.0.0
+billiard==3.6.1.0
 bleach==3.1.0
-bokeh==1.0.4
 boto==2.49.0
-braintree==3.55.0
+btrfsutil==1.1.1
-cairocffi==1.0.2
+CacheControl==0.12.6
+case==1.5.3
+catfish==1.4.13
 celery==4.3.0
-certifi==2019.3.9
+ceph-volume==1.0.0
-cffi==1.12.2
+cephfs==2.0.0
+cephfs-shell==0.0.1
+certifi==2019.11.28
+cffi==1.13.2
 chardet==3.0.4
-Click==7.0
+colorama==0.4.3
-cloudpickle==1.2.2
+contextlib2==0.6.0
-colorama==0.4.1
+cryptography==2.8
-colorclass==2.2.0
-cookies==2.2.1
-coreapi==2.3.3
-coreschema==0.0.4
-coverage==4.5.3
-cryptography==2.6.1
 cycler==0.10.0
-dask==2.6.0
+decorator==4.4.1
-decorator==4.4.0
+defusedxml==0.6.0
-defusedxml==0.5.0
+distlib==0.3.0
-Django==2.1.7
+distro==1.4.0
-django-analytical==2.5.0
-django-async-messages==0.3.1
-django-braces==1.13.0
-django-classy-tags==0.8.0
-django-cookie-law==2.0.1
-django-cors-headers==2.5.2
-django-countries==5.3.3
-django-datetime-widget==0.9.3
-django-debug-toolbar==2.0
-django-extensions==2.1.6
-django-htmlmin==0.11.0
-django-leaflet==0.24.0
-django-mailbox==4.8.0
-django-oauth-toolkit==1.2.0
-django-oauth2-provider==0.2.6.1
-django-redis==4.10.0
-django-rest-framework==0.1.0
-django-rest-swagger==2.2.0
-django-rq==1.3.1
-django-rq-dashboard==0.3.3
-django-ses==0.8.10
-django-shell-plus==1.1.7
-django-social-share==1.3.2
-django-suit==0.2.26
-django-suit-rq==1.0.1
-django-tz-detect==0.2.9
-djangorestframework==3.9.2
 docopt==0.6.2
-docutils==0.14
 entrypoints==0.3
-execnet==1.5.0
+gufw==19.10.0
-factory-boy==2.11.1
-Faker==1.0.4
-fastparquet==0.3.2
-fitparse==1.1.0
-Flask==1.0.2
-fsspec==0.5.2
-future==0.17.1
-geocoder==1.38.1
-geos==0.2.1
-grpcio==1.26.0
-grpcio-tools==1.26.0
-holoviews==1.11.3
 html5lib==1.0.1
 htmlmin==0.1.12
-HTMLParser==0.0.2
+httplib2==0.14.0
-httplib2==0.12.1
-hvplot==0.4.0
-icalendar==4.0.3
 idna==2.8
-image==1.5.27
+importlib-metadata==1.4.0
-importlib-resources==1.0.2
+ipykernel==5.1.3
-ipykernel==5.1.0
+ipython==7.11.1
-ipython==7.4.0
+ipython-genutils==0.1.0
-ipython-genutils==0.2.0
+ipywidgets==7.5.1
-ipywidgets==7.4.2
+Jade-Application-Kit==2.1.3
-iso8601==0.1.12
+jedi==0.15.1
-isodate==0.6.0
+Jinja2==2.10.3
-itsdangerous==1.1.0
+jsonschema==3.2.0
-itypes==1.1.0
+jupyter-client==5.3.4
-jedi==0.13.3
-jeepney==0.4
-Jinja2==2.10
-json5==0.8.5
-jsonschema==3.0.1
-jupyter==1.0.0
-jupyter-client==5.2.4
 jupyter-console==6.0.0
-jupyter-core==4.4.0
+jupyter-core==4.6.1
-jupyterlab==0.35.4
+keyutils==0.6
-jupyterlab-server==0.3.0
+kiwisolver==1.1.0
-keyring==18.0.0
+kombu==4.6.7
-kiwisolver==1.0.1
+lensfun==0.3.2
-kombu==4.5.0
+LibAppArmor==2.13.3
-llvmlite==0.30.0
+lightdm-gtk-greeter-settings==1.2.2
-lxml==4.3.2
+lockfile==0.12.2
-Markdown==3.0.1
+louis==3.12.0
+lxml==4.4.2
 MarkupSafe==1.1.1
-matplotlib==3.0.3
+matplotlib==3.1.2
-minify==0.1.4
+menulibre==2.2.1
-MiniMockTest==0.5
 mistune==0.8.4
-mock==2.0.0
+more-itertools==8.1.0
-more-itertools==6.0.0
+msgpack==0.6.2
-mpld3==0.3
+mugshot==0.4.2
-mysqlclient==1.4.2.post1
+nbconvert==5.6.1
-nbconvert==5.4.1
 nbformat==4.4.0
-newrelic==5.2.1.129
 nose==1.3.7
-nose-parameterized==0.6.0
+notebook==6.0.2
-notebook==5.7.6
+npyscreen==4.10.5
-numba==0.46.0
+numpy==1.18.1
-numpy==1.16.2
+openshot-qt==2.4.4
-oauth2==1.9.0.post1
+ordered-set==3.1.1
-oauthlib==3.0.1
+packaging==20.0
-openapi-codec==1.3.2
+pacman-mirrors==4.16.2
-packaging==19.0
-pandas==0.24.2
 pandocfilters==1.4.2
-param==1.8.2
+parso==0.5.2
-parso==0.3.4
+pep517==0.6.0
-pathspec==0.5.9
+pexpect==4.7.0
-pbr==5.1.3
-pexpect==4.6.0
 pickleshare==0.7.5
-Pillow==5.4.1
+Pillow==6.2.1
-pip-upgrader==1.4.6
+pkgconfig==1.5.1
-pluggy==0.9.0
+pkginfo==1.5.0.1
-prometheus-client==0.6.0
+ply==3.11
-prompt-toolkit==2.0.9
+progress==1.5
-protobuf==3.11.1
+prometheus-client==0.7.1
-psycopg2==2.8.1
+prompt-toolkit==3.0.2
+psutil==5.6.7
 ptyprocess==0.6.0
-py==1.8.0
+pycairo==1.18.2
-pyarrow==0.15.0
 pycparser==2.19
-Pygments==2.3.1
+pycups==1.9.74
-pyparsing==2.3.1
+pycurl==7.43.0.3
-pyrsistent==0.14.11
+Pygments==2.5.2
-pyshp==2.1.0
+PyGObject==3.34.0
-pytest==4.3.1
+pymongo==3.10.1
-pytest-django==3.4.8
+pyOpenSSL==19.1.0
-pytest-forked==1.0.2
+pyparsing==2.4.6
-pytest-runner==4.4
+PyQt5==5.14.1
-pytest-sugar==0.9.2
+PyQt5-sip==12.7.0
-pytest-xdist==1.27.0
+PyQtWebEngine==5.14.0
-python-dateutil==2.8.0
+Pyro4==4.77
-python-memcached==1.59
+pyrsistent==0.15.7
-python-twitter==3.5
+python-dateutil==2.8.1
-pytz==2018.9
+python-distutils-extra==2.39
-pyviz-comms==0.7.1
+pytoml==0.1.21
-pywin32-ctypes==0.2.0
+pytz==2019.3
-pywinpty==0.5.5
+pyxdg==0.26
-PyYAML==5.1
+PyYAML==5.3
-pyzmq==18.0.1
+pyzmq==18.1.1
-qtconsole==4.4.3
+rados==2.0.0
-ratelim==0.1.6
+rbd==2.0.0
-redis==3.2.1
+redis==3.3.11
-requests==2.21.0
+requests==2.22.0
-requests-oauthlib==1.2.0
+retrying==1.3.3
-rowingdata==2.5.9
+rgw==2.0.0
-rowingphysics==0.5.0
+scipy==1.4.1
-rq==0.13.0
-rules==2.1
-scipy==1.2.1
-SecretStorage==3.1.1
 Send2Trash==1.5.0
-shell==1.0.1
+serpent==1.27
-shortuuid==0.5.0
+six==1.13.0
-simplejson==3.16.0
+soupsieve==1.9.5
-six==1.12.0
+SQLAlchemy==1.3.12
-soupsieve==1.8
+team==1.0
-SQLAlchemy==1.3.1
+terminado==0.8.3
-sqlparse==0.3.0
+testpath==0.4.4
-stravalib==0.10.2
+tornado==6.0.3
-termcolor==1.1.0
+traitlets==4.3.3
-terminado==0.8.1
+udiskie==2.0.2
-terminaltables==3.1.0
+ufw==0.36
-testpath==0.4.2
+urllib3==1.25.7
-text-unidecode==1.2
-thrift==0.11.0
-timezonefinder==4.0.1
-toolz==0.10.0
-tornado==6.0.1
-tqdm==4.31.1
-traitlets==4.3.2
-units==0.7
-uritemplate==3.0.0
-urllib3==1.24.1
-VerbalExpressions==0.0.2
 vine==1.3.0
-wcwidth==0.1.7
+virtualenv==16.1.0
+wcwidth==0.1.8
 webencodings==0.5.1
-Werkzeug==0.15.1
+widgetsnbextension==3.5.1
-widgetsnbextension==3.4.2
+wrapt==1.11.2
 xlrd==1.2.0
-xmltodict==0.12.0
+zipp==0.6.0
-yamjam==0.1.7
-yamllint==1.15.0
-yuicompressor==2.4.8

rowers/templates/menuscript.html

@@ -33,3 +33,4 @@
   });
   });
 </script>
+<noscript>Your browser does not support JavaScript</noscript>

rowers/tests/.~lock.viewnames.csv#

@@ -1 +0,0 @@
-,sander,sander-pc,25.01.2020 15:42,file:///home/sander/.config/libreoffice/4;