Merge branch 'production' into 'development'
adega#143 Merge 'production' branch into 'development' See merge request adega/adega!46
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- README.md 35 additions, 4 deletionsREADME.md
- docker_scripts/docker-compose.yml 2 additions, 1 deletiondocker_scripts/docker-compose.yml
- docker_scripts/docker-production.yml 39 additions, 0 deletionsdocker_scripts/docker-production.yml
- docker_scripts/on_docker_init_production.sh 11 additions, 0 deletionsdocker_scripts/on_docker_init_production.sh
- gunicorn/gunicorn.service 1 addition, 2 deletionsgunicorn/gunicorn.service
- makefile 3 additions, 0 deletionsmakefile
- nginx/Dockerfile 4 additions, 0 deletionsnginx/Dockerfile
- nginx/adega 5 additions, 7 deletionsnginx/adega
- nginx/sites-enabled/adega 26 additions, 0 deletionsnginx/sites-enabled/adega
- src/adega/settings.py 14 additions, 9 deletionssrc/adega/settings.py
- src/adega/templates/adega/dashboard.html 15 additions, 2 deletionssrc/adega/templates/adega/dashboard.html
- src/adega/templates/adega/navbar.html 10 additions, 7 deletionssrc/adega/templates/adega/navbar.html
- src/adega/templates/adega/sidebar.html 5 additions, 5 deletionssrc/adega/templates/adega/sidebar.html
- src/adega/urls.py 16 additions, 12 deletionssrc/adega/urls.py
- src/adega/views.py 13 additions, 3 deletionssrc/adega/views.py
- src/admission/templates/admission/index.html 1 addition, 1 deletionsrc/admission/templates/admission/index.html
- src/admission/views.py 14 additions, 6 deletionssrc/admission/views.py
- src/course/templates/course/index.html 1 addition, 1 deletionsrc/course/templates/course/index.html
- src/course/views.py 12 additions, 6 deletionssrc/course/views.py
Loading
Please register or sign in to comment