Merge branch 'develop' into 'master'

Develop

See merge request !17

.mailmap

+Gottfried Gaisbauer <gogo@servus.at> Gottfried <gogo@servus.at>
+Ingo Leindecker <ingo.leindecker@fro.at> ingo <ingo.leindecker@fro.at>
+David Trattnig <david.trattnig@gmail.com> <david@subsquare.at>
+David Trattnig <david.trattnig@gmail.com> <david.trattnig@o94.at>
+David Trattnig <david.trattnig@gmail.com> david
+Christian Pointner <equinox@helsinki.at> Christian Pointner <equinox@spreadspace.org>
+Ernesto Rico Schmidt <ernesto@helsinki.at> Ernesto Rico Schmidt <e.rico.schmidt@gmail.com>
+Ernesto Rico Schmidt <ernesto@helsinki.at> nnrcschmdt <e.rico.schmidt@gmail.com>
+Hermann Schwärzler <hermann.schwaerzler@freirad.at> Hermann <hermann@laptop>
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> <jackie@o94.at>
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> Andrea Ida Malkah Klaura
\ No newline at end of file

requirements.txt

@@ -8,6 +8,7 @@ djangorestframework==3.11.0
 drf-nested-routers==0.91
 Pillow==4.3.0
 python-dateutil==2.8.1
+wheel==0.37.0
 
 # needed for the database (container)
 psycopg2_binary==2.8.6

run.sh

@@ -15,8 +15,8 @@ docker="false"
 
 # - docker:build
 # - docker:push
-# - docker:serve
-#
+# - docker:dev
+# 
 
 if [[ $* =~ ^(init|dev|prod|test|build|push|serve)$ ]]; then
 	mode=$1
@@ -80,7 +80,7 @@ if [[ $docker == "true" ]]; then
 
 	### Runs Steering from Docker ###
 
-	if [[ $mode == "serve" ]]; then
+	if [[ $mode == "dev" ]]; then
 		exec sudo docker run --rm -it \
             -u $UID:$GID \
             -p 127.0.0.1:8000:8000 \