Merge branch 'master' into helppage
# Conflicts: # vote/views.py
Showing
- .gitlab-ci.yml 2 additions, 2 deletions.gitlab-ci.yml
- docs/deploying.md 9 additions, 4 deletionsdocs/deploying.md
- management/consumers.py 39 additions, 0 deletionsmanagement/consumers.py
- management/forms.py 1 addition, 1 deletionmanagement/forms.py
- management/routing.py 8 additions, 0 deletionsmanagement/routing.py
- management/templates/management/add_election.html 2 additions, 0 deletionsmanagement/templates/management/add_election.html
- management/templates/management/add_session.html 3 additions, 0 deletionsmanagement/templates/management/add_session.html
- management/templates/management/application.html 1 addition, 2 deletionsmanagement/templates/management/application.html
- management/templates/management/election.html 15 additions, 6 deletionsmanagement/templates/management/election.html
- management/templates/management/index.html 2 additions, 0 deletionsmanagement/templates/management/index.html
- management/templates/management/session.html 38 additions, 58 deletionsmanagement/templates/management/session.html
- management/templates/management/session_election_item.html 48 additions, 0 deletionsmanagement/templates/management/session_election_item.html
- management/templates/management/session_settings.html 3 additions, 0 deletionsmanagement/templates/management/session_settings.html
- management/templates/management/spectator_settings.html 34 additions, 0 deletionsmanagement/templates/management/spectator_settings.html
- management/urls.py 1 addition, 0 deletionsmanagement/urls.py
- management/views.py 32 additions, 3 deletionsmanagement/views.py
- requirements.txt 2 additions, 1 deletionrequirements.txt
- requirements_dev.txt 1 addition, 1 deletionrequirements_dev.txt
- static/js/application.js 0 additions, 0 deletionsstatic/js/application.js
- static/js/reload.js 48 additions, 0 deletionsstatic/js/reload.js
Loading
Please register or sign in to comment