Merge branch 'python3-translation' into 'master'
Python3 translation Closes #337 and #338 See merge request NCER-PD/scheduling-system!261
Showing
- .dockerignore 7 additions, 0 deletions.dockerignore
- .gitlab-ci.yml 4 additions, 4 deletions.gitlab-ci.yml
- Dockerfile 14 additions, 0 deletionsDockerfile
- docker-compose.yml 62 additions, 0 deletionsdocker-compose.yml
- docker/nginx/dhparam.pem 24 additions, 0 deletionsdocker/nginx/dhparam.pem
- docker/nginx/generate_keys.sh 5 additions, 0 deletionsdocker/nginx/generate_keys.sh
- docker/nginx/nginx-selfsigned.crt 22 additions, 0 deletionsdocker/nginx/nginx-selfsigned.crt
- docker/nginx/nginx-selfsigned.key 28 additions, 0 deletionsdocker/nginx/nginx-selfsigned.key
- docker/nginx/nginx.conf 49 additions, 0 deletionsdocker/nginx/nginx.conf
- docker/nginx/smasch.conf 51 additions, 0 deletionsdocker/nginx/smasch.conf
- readme.md 12 additions, 1 deletionreadme.md
- requirements-dev.txt 3 additions, 3 deletionsrequirements-dev.txt
- requirements.txt 16 additions, 16 deletionsrequirements.txt
- smash/db_scripts/create_dummy_data.py 27 additions, 27 deletionssmash/db_scripts/create_dummy_data.py
- smash/db_scripts/fix_screening_numbers.py 6 additions, 6 deletionssmash/db_scripts/fix_screening_numbers.py
- smash/db_scripts/import_file.py 44 additions, 44 deletionssmash/db_scripts/import_file.py
- smash/smash/settings.py 1 addition, 1 deletionsmash/smash/settings.py
- smash/smash/urls.py 3 additions, 1 deletionsmash/smash/urls.py
- smash/web/admin.py 1 addition, 1 deletionsmash/web/admin.py
- smash/web/algorithm/__init__.py 2 additions, 2 deletionssmash/web/algorithm/__init__.py
Loading
Please register or sign in to comment