Merge remote-tracking branch 'upstream/master' into dataformatA2 (30d0524e) · Commits · Projects / HEV - High Energy Ventilator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

HEV - High Energy Ventilator
- Activity
- Members
- Labels
- Issues
  5
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Projects
HEV - High Energy Ventilator
Commits
30d0524e

Commit 30d0524e authored 4 years ago by

Chris Burr

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into dataformatA2

parents b244ab45 7e918bc5

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

ansible/README.md 3 additions, 2 deletions

ansible/README.md
raspberry-backend/static/css/notifications.css 1 addition, 1 deletion

raspberry-backend/static/css/notifications.css
raspberry-backend/static/css/style_v3.css 90 additions, 5 deletions

raspberry-backend/static/css/style_v3.css
raspberry-backend/static/js/Chart-display.js 144 additions, 77 deletions

raspberry-backend/static/js/Chart-display.js
raspberry-backend/static/js/Chart-displayLoop.js 63 additions, 59 deletions

raspberry-backend/static/js/Chart-displayLoop.js
raspberry-backend/static/js/Gauge.js 217 additions, 0 deletions

raspberry-backend/static/js/Gauge.js
raspberry-backend/templates/base.html 96 additions, 31 deletions

raspberry-backend/templates/base.html
raspberry-backend/templates/charts.html 3 additions, 15 deletions

raspberry-backend/templates/charts.html
raspberry-backend/templates/index.html 67 additions, 119 deletions

raspberry-backend/templates/index.html

with 684 additions and 309 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment