-
- Downloads
Merge branch 'staging' into assets
Conflicts: django/website/templates/base.html
Showing
- deploy/pip_packages.txt 1 addition, 1 deletiondeploy/pip_packages.txt
- django/website/dashboard/static/dashboard/dashboard.css 6 additions, 5 deletionsdjango/website/dashboard/static/dashboard/dashboard.css
- django/website/dashboard/templates/dashboard/basic-text-widget.html 1 addition, 1 deletion...site/dashboard/templates/dashboard/basic-text-widget.html
- django/website/dashboard/templates/dashboard/dashboard.html 106 additions, 109 deletionsdjango/website/dashboard/templates/dashboard/dashboard.html
- django/website/hid/static/hid/js/messages.js 11 additions, 0 deletionsdjango/website/hid/static/hid/js/messages.js
- django/website/hid/static/hid/js/spinner.js 9 additions, 0 deletionsdjango/website/hid/static/hid/js/spinner.js
- django/website/hid/templates/hid/sources.html 3 additions, 3 deletionsdjango/website/hid/templates/hid/sources.html
- django/website/hid/templates/hid/table.html 5 additions, 3 deletionsdjango/website/hid/templates/hid/table.html
- django/website/hid/templates/hid/view.html 29 additions, 13 deletionsdjango/website/hid/templates/hid/view.html
- django/website/hid/templates/hid/widgets/chart.html 1 addition, 1 deletiondjango/website/hid/templates/hid/widgets/chart.html
- django/website/hid/tests/views_tests.py 1 addition, 0 deletionsdjango/website/hid/tests/views_tests.py
- django/website/local_settings.py.jenkins 1 addition, 1 deletiondjango/website/local_settings.py.jenkins
- django/website/local_settings.py.production 1 addition, 1 deletiondjango/website/local_settings.py.production
- django/website/local_settings.py.staging 1 addition, 1 deletiondjango/website/local_settings.py.staging
- django/website/media/css/styles.css 354 additions, 194 deletionsdjango/website/media/css/styles.css
- django/website/media/less/internews-bootstrap.less 2 additions, 0 deletionsdjango/website/media/less/internews-bootstrap.less
- django/website/media/less/internews-cosmo.less 1 addition, 0 deletionsdjango/website/media/less/internews-cosmo.less
- django/website/media/less/internews-mixins.less 3 additions, 7 deletionsdjango/website/media/less/internews-mixins.less
- django/website/media/less/internews-variables.less 9 additions, 9 deletionsdjango/website/media/less/internews-variables.less
- django/website/media/less/internews.less 60 additions, 16 deletionsdjango/website/media/less/internews.less
Loading
Please register or sign in to comment