Merge branch 'staging' into jenkins
Showing
- django/website/hid/tables.py 23 additions, 8 deletionsdjango/website/hid/tables.py
- django/website/hid/templates/hid/categories_column.html 7 additions, 0 deletionsdjango/website/hid/templates/hid/categories_column.html
- django/website/hid/templates/hid/table.html 1 addition, 1 deletiondjango/website/hid/templates/hid/table.html
- django/website/hid/tests/views_tests.py 81 additions, 19 deletionsdjango/website/hid/tests/views_tests.py
- django/website/hid/views.py 48 additions, 10 deletionsdjango/website/hid/views.py
- django/website/media/css/styles.css 3 additions, 0 deletionsdjango/website/media/css/styles.css
Loading
Please register or sign in to comment