Merge branch 'master' into release
Conflicts: dashboard_app/views/__init__.py lava_scheduler_app/views.py
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .gitreview 1 addition, 1 deletion.gitreview
- MANIFEST.in 5 additions, 3 deletionsMANIFEST.in
- dashboard_app/static/dashboard_app/js/image-chart.js 44 additions, 0 deletionsdashboard_app/static/dashboard_app/js/image-chart.js
- dashboard_app/templates/dashboard_app/image_report_detail.html 2 additions, 1 deletion...oard_app/templates/dashboard_app/image_report_detail.html
- dashboard_app/templates/dashboard_app/image_report_display.html 3 additions, 0 deletions...ard_app/templates/dashboard_app/image_report_display.html
- dashboard_app/templates/dashboard_app/mybundlestreams.html 1 addition, 0 deletionsdashboard_app/templates/dashboard_app/mybundlestreams.html
- dashboard_app/templates/dashboard_app/test_run_detail.html 1 addition, 1 deletiondashboard_app/templates/dashboard_app/test_run_detail.html
- dashboard_app/templatetags/keep_spacing.py 13 additions, 0 deletionsdashboard_app/templatetags/keep_spacing.py
- dashboard_app/views/__init__.py 1 addition, 1 deletiondashboard_app/views/__init__.py
- doc/Makefile 4 additions, 4 deletionsdoc/Makefile
- doc/QUICKSTART 157 additions, 0 deletionsdoc/QUICKSTART
- doc/arm_energy_probe.rst 102 additions, 0 deletionsdoc/arm_energy_probe.rst
- doc/boot-management.rst 55 additions, 0 deletionsdoc/boot-management.rst
- doc/conf.py 12 additions, 8 deletionsdoc/conf.py
- doc/configuration.rst 40 additions, 0 deletionsdoc/configuration.rst
- doc/cu-ttyUSB0.cf 2 additions, 0 deletionsdoc/cu-ttyUSB0.cf
- doc/data-export.rst 112 additions, 0 deletionsdoc/data-export.rst
- doc/debugging.rst 119 additions, 0 deletionsdoc/debugging.rst
- doc/developing-tests.rst 445 additions, 0 deletionsdoc/developing-tests.rst
Loading
Please register or sign in to comment