Merge branch 'master' into 'pipe-import-academic'

# Conflicts:
#   requirements.txt

config/default.env

@@ -2,7 +2,7 @@ NACSOS_LOG_CONF_FILE="config/logging.toml"
 
 NACSOS_SERVER__HOST="localhost"
 NACSOS_SERVER__PORT=8081
-NACSOS_SERVER__CORS_ORIGINS='["http://localhost:8080", "http://localhost:8081","http://localhost", "http://0.0.0.0:8081", "http://0.0.0.0", "http://127.0.0.1:8081", "http://127.0.0.1"]'
+NACSOS_SERVER__CORS_ORIGINS='["http://localhost:8080","http://localhost:8081", "http://localhost:8082","http://localhost", "http://0.0.0.0:8081", "http://0.0.0.0", "http://127.0.0.1:8081", "http://127.0.0.1"]'
 NACSOS_SERVER__HEADER_CORS=true
 
 NACSOS_DB__HOST="localhost"

requirements.txt

@@ -7,4 +7,6 @@ python-jose[cryptography]==3.3.0
 passlib[bcrypt]==1.7.4
 httpx[http2]==0.23.0
 pymitter==0.4.0
--e git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@0ef99deeba3ea7f9f7efe4569d8e050e48494ace#egg=nacsos_data
+uvicorn==0.20.0
\ No newline at end of file
+python-multipart==0.0.5
+-e git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@0ef99deeba3ea7f9f7efe4569d8e050e48494ace#egg=nacsos_data