Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Dashboard
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3b92632b

Commit 3b92632b authored 5 years ago by Trystan Lea

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into stable

parents ec86b805 29ff998c

Loading

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

Views/dashboard_edit_view.php 23 additions, 15 deletions

Views/dashboard_edit_view.php
dashboard_model.php 4 additions, 1 deletion

dashboard_model.php
module.json 1 addition, 1 deletion

module.json
widget/feedvalue/feedvalue_render.js 20 additions, 2 deletions

widget/feedvalue/feedvalue_render.js
widget/isactivefeed/isactivefeed_render.js 35 additions, 6 deletions

widget/isactivefeed/isactivefeed_render.js
widget/kwhperiod/kwhperiod_doco.png 0 additions, 0 deletions

widget/kwhperiod/kwhperiod_doco.png
widget/kwhperiod/kwhperiod_render.md 1 addition, 0 deletions

widget/kwhperiod/kwhperiod_render.md
widget/thresholds/thresholds_render.js 33 additions, 4 deletions

widget/thresholds/thresholds_render.js

with 117 additions and 29 deletions

Loading

0% Loading 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