Merge branch 'date_fix' into datalayer
Conflicts: django/website/chn_spreadsheet/tests.py
Showing
- deploy/pip_packages.txt 3 additions, 2 deletionsdeploy/pip_packages.txt
- django/website/chn_spreadsheet/importer.py 189 additions, 0 deletionsdjango/website/chn_spreadsheet/importer.py
- django/website/chn_spreadsheet/tests.py 47 additions, 24 deletionsdjango/website/chn_spreadsheet/tests.py
- django/website/chn_spreadsheet/utils.py 0 additions, 198 deletionsdjango/website/chn_spreadsheet/utils.py
- django/website/data_layer/handlers.py 8 additions, 0 deletionsdjango/website/data_layer/handlers.py
- django/website/data_layer/tests/handler_tests.py 29 additions, 0 deletionsdjango/website/data_layer/tests/handler_tests.py
- django/website/hid/admin.py 0 additions, 3 deletionsdjango/website/hid/admin.py
- django/website/hid/models.py 0 additions, 3 deletionsdjango/website/hid/models.py
- django/website/hid/tables.py 26 additions, 0 deletionsdjango/website/hid/tables.py
- django/website/hid/templates/hid/dashboard.html 2 additions, 2 deletionsdjango/website/hid/templates/hid/dashboard.html
- django/website/hid/templates/hid/table.html 76 additions, 0 deletionsdjango/website/hid/templates/hid/table.html
- django/website/hid/templates/hid/view.html 16 additions, 2 deletionsdjango/website/hid/templates/hid/view.html
- django/website/hid/tests/views_tests.py 82 additions, 0 deletionsdjango/website/hid/tests/views_tests.py
- django/website/hid/urls.py 5 additions, 4 deletionsdjango/website/hid/urls.py
- django/website/hid/views.py 44 additions, 2 deletionsdjango/website/hid/views.py
- django/website/media/css/styles.css 52 additions, 8 deletionsdjango/website/media/css/styles.css
- django/website/settings.py 8 additions, 2 deletionsdjango/website/settings.py
- django/website/templates/base.html 23 additions, 15 deletionsdjango/website/templates/base.html
- django/website/templates/registration/logged_out.html 0 additions, 11 deletionsdjango/website/templates/registration/logged_out.html
- django/website/templates/registration/login.html 0 additions, 13 deletionsdjango/website/templates/registration/login.html
Loading
Please register or sign in to comment