Merge branch 'staging' into release
2014.07.1 Production release.
Showing
- dashboard_app/models.py 3 additions, 1 deletiondashboard_app/models.py
- dashboard_app/static/dashboard_app/js/image-chart.js 117 additions, 25 deletionsdashboard_app/static/dashboard_app/js/image-chart.js
- dashboard_app/static/dashboard_app/js/image-report.js 100 additions, 4 deletionsdashboard_app/static/dashboard_app/js/image-report.js
- dashboard_app/templates/dashboard_app/image-report.html 5 additions, 18 deletionsdashboard_app/templates/dashboard_app/image-report.html
- dashboard_app/templates/dashboard_app/image_chart_filter_form.html 1 addition, 1 deletion..._app/templates/dashboard_app/image_chart_filter_form.html
- dashboard_app/templates/dashboard_app/image_report_display.html 4 additions, 8 deletions...ard_app/templates/dashboard_app/image_report_display.html
- dashboard_app/templatetags/make_safe.py 15 additions, 0 deletionsdashboard_app/templatetags/make_safe.py
- dashboard_app/views/__init__.py 16 additions, 6 deletionsdashboard_app/views/__init__.py
- dashboard_app/views/image_reports/views.py 0 additions, 3 deletionsdashboard_app/views/image_reports/views.py
- lava_scheduler_app/models.py 12 additions, 2 deletionslava_scheduler_app/models.py
Loading
Please register or sign in to comment