LAVA Dashboard (deprecated)

Merge lp://staging/~stevanr/lava-dashboard/image-reports-gui into lp://staging/lava-dashboard

  1. image-reports-gui
  2. Merge into trunk
Proposed by Stevan Radaković
Status: Rejected
Rejected by: Stevan Radaković
Proposed branch: lp://staging/~stevanr/lava-dashboard/image-reports-gui
Merge into: lp://staging/lava-dashboard
Diff against target: 3914 lines (+3813/-0) (has conflicts)
17 files modified
dashboard_app/migrations/0032_auto__add_unique_imagereportchart_image_report_name.py (+306/-0)
dashboard_app/models.py.OTHER (+2089/-0)
dashboard_app/static/dashboard_app/css/image-charts.css.OTHER (+138/-0)
dashboard_app/static/dashboard_app/js/excanvas.min.js.OTHER (+1/-0)
dashboard_app/static/dashboard_app/js/image-chart.js (+291/-0)
dashboard_app/static/dashboard_app/js/jquery.flot.canvas.min.js (+28/-0)
dashboard_app/static/dashboard_app/js/jquery.flot.min.js.OTHER (+29/-0)
dashboard_app/static/dashboard_app/js/jquery.flot.navigate.min.js.OTHER (+86/-0)
dashboard_app/static/dashboard_app/js/jquery.flot.selection.min.js.OTHER (+79/-0)
dashboard_app/static/dashboard_app/js/jquery.flot.stack.min.js.OTHER (+36/-0)
dashboard_app/templates/dashboard_app/image_report_chart_detail.html.OTHER (+89/-0)
dashboard_app/templates/dashboard_app/image_report_chart_form.html.OTHER (+66/-0)
dashboard_app/templates/dashboard_app/image_report_detail.html.OTHER (+77/-0)
dashboard_app/templates/dashboard_app/image_report_display.html (+26/-0)
dashboard_app/templates/dashboard_app/image_report_list.html.OTHER (+40/-0)
dashboard_app/urls.py.OTHER (+91/-0)
dashboard_app/views/image_reports/views.py.OTHER (+341/-0)
Conflict adding files to dashboard_app.  Created directory.
Conflict because dashboard_app is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dashboard_app/migrations.  Created directory.
Conflict because dashboard_app/migrations is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dashboard_app/models.py
Conflict adding files to dashboard_app/static.  Created directory.
Conflict because dashboard_app/static is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dashboard_app/static/dashboard_app.  Created directory.
Conflict because dashboard_app/static/dashboard_app is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dashboard_app/static/dashboard_app/css.  Created directory.
Conflict because dashboard_app/static/dashboard_app/css is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dashboard_app/static/dashboard_app/css/image-charts.css
Conflict adding files to dashboard_app/static/dashboard_app/js.  Created directory.
Conflict because dashboard_app/static/dashboard_app/js is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dashboard_app/static/dashboard_app/js/excanvas.min.js
Contents conflict in dashboard_app/static/dashboard_app/js/jquery.flot.min.js
Contents conflict in dashboard_app/static/dashboard_app/js/jquery.flot.navigate.min.js
Contents conflict in dashboard_app/static/dashboard_app/js/jquery.flot.selection.min.js
Contents conflict in dashboard_app/static/dashboard_app/js/jquery.flot.stack.min.js
Conflict adding files to dashboard_app/templates.  Created directory.
Conflict because dashboard_app/templates is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dashboard_app/templates/dashboard_app.  Created directory.
Conflict because dashboard_app/templates/dashboard_app is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dashboard_app/templates/dashboard_app/image_report_chart_detail.html
Contents conflict in dashboard_app/templates/dashboard_app/image_report_chart_form.html
Contents conflict in dashboard_app/templates/dashboard_app/image_report_detail.html
Contents conflict in dashboard_app/templates/dashboard_app/image_report_list.html
Contents conflict in dashboard_app/urls.py
Conflict adding files to dashboard_app/views.  Created directory.
Conflict because dashboard_app/views is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to dashboard_app/views/image_reports.  Created directory.
Conflict because dashboard_app/views/image_reports is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dashboard_app/views/image_reports/views.py
To merge this branch: bzr merge lp://staging/~stevanr/lava-dashboard/image-reports-gui
Reviewer Review Type Date Requested Status
Stevan Radaković Disapprove
Review via email: mp+187003@code.staging.launchpad.net

Description of the change

Test MP. Do not merge.

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) :
review: Disapprove

Unmerged revisions

432. By Stevan Radaković

Add filters links below headline.

431. By Stevan Radaković

Add dates, introduce canvas plugin.

430. By Stevan Radaković

Update jquery flot library and plugins. Add canvas plugin.

429. By Stevan Radaković

Fix image rendering.

428. By Stevan Radaković

Add hover event to the plot.

427. By Stevan Radaković

Multiple small changes. Interactibility added.

426. By Stevan Radaković

Display for reports with charts and legends with sortable plugin.

425. By Stevan Radaković

Add simple plot generation with chart data.

424. By Stevan Radaković

Add unique together contraint for name and image report on image
report charts.

423. By Stevan Radaković

Add display view and empty page.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches