Merge branch 'master' into helppage
# Conflicts: # management/templates/management/base.html # vote/views.py
Showing
- .gitlab-ci.yml 46 additions, 3 deletions.gitlab-ci.yml
- .pylintrc 1 addition, 1 deletion.pylintrc
- Makefile 18 additions, 0 deletionsMakefile
- README.md 30 additions, 25 deletionsREADME.md
- docs/deploying.md 138 additions, 0 deletionsdocs/deploying.md
- management/authentication.py 7 additions, 2 deletionsmanagement/authentication.py
- management/forms.py 126 additions, 36 deletionsmanagement/forms.py
- management/management/commands/create_admin.py 35 additions, 19 deletionsmanagement/management/commands/create_admin.py
- management/management/commands/process_reminders.py 1 addition, 1 deletionmanagement/management/commands/process_reminders.py
- management/models.py 4 additions, 3 deletionsmanagement/models.py
- management/static/management/css/DateTimePicker.css 245 additions, 0 deletionsmanagement/static/management/css/DateTimePicker.css
- management/static/management/css/style.css 29 additions, 0 deletionsmanagement/static/management/css/style.css
- management/static/management/js/DateTimePicker.js 2550 additions, 0 deletionsmanagement/static/management/js/DateTimePicker.js
- management/static/management/js/datetime.js 5 additions, 0 deletionsmanagement/static/management/js/datetime.js
- management/static/management/js/session.js 5 additions, 1 deletionmanagement/static/management/js/session.js
- management/templates/management/add_election.html 16 additions, 10 deletionsmanagement/templates/management/add_election.html
- management/templates/management/add_session.html 15 additions, 10 deletionsmanagement/templates/management/add_session.html
- management/templates/management/application.html 18 additions, 18 deletionsmanagement/templates/management/application.html
- management/templates/management/base.html 3 additions, 5 deletionsmanagement/templates/management/base.html
- management/templates/management/election.html 34 additions, 35 deletionsmanagement/templates/management/election.html
Loading
Please register or sign in to comment