mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00

Files

Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting

Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go

2016-07-11 18:28:07 +02:00

img

added new icons for default panels

2016-03-24 16:14:51 -04:00

partials

feat(alerting): only expose DTO info when requesting all notifications

2016-06-20 11:31:20 +02:00

specs

test(alerting): fixes broken tests for alerting thresholds

2016-06-20 10:06:18 +02:00

alert_tab_ctrl.ts

feat(alerting): thesholds unification

2016-06-15 10:41:21 +02:00

graph_tooltip.d.ts

feat(plugins): work on plugin directive loading

2016-01-14 13:21:05 +01:00

graph_tooltip.js

feat(graph): graph tooltip sort order PR refactored/changed #4944 , changed the layout graph display options, #4944

2016-06-15 17:20:55 +02:00

graph.js

Merge branch 'master' into alerting

2016-07-11 18:28:07 +02:00

jquery.flot.events.js

fix(flot): fixed flot issue introduced in alerting branch

2016-06-28 14:04:29 -07:00

legend.js

fix(graph): fixed color picker appearingunder pinned side nav, fixes #4556

2016-04-12 11:07:34 -04:00

module.ts

test(alerting): fixes broken tests for alerting thresholds

2016-06-20 10:06:18 +02:00

plugin.json

added new icons for default panels

2016-03-24 16:14:51 -04:00

README.md

feat(plugins): adds a readme for every native plugin

2016-03-30 23:33:30 +02:00

series_overrides_ctrl.js

fix z-index order in Series Overrides

2016-06-20 20:54:01 -04:00

tab_axes.html

feat(alerting): thresholds rethink

2016-06-14 16:45:51 +02:00

tab_display.html

feat(graph): graph tooltip sort order PR refactored/changed #4944 , changed the layout graph display options, #4944

2016-06-15 17:20:55 +02:00

tab_legend.html

fix(graph panel): Fixed legend option max not updating, fixes #4601

2016-04-07 10:57:55 -04:00

template.ts

fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400

2016-03-20 11:17:53 +01:00

thresholds.ts

feat(alerting): thesholds unification

2016-06-15 10:41:21 +02:00

README.md

Graph Panel - Native Plugin

The Graph is the main graph panel and is included with Grafana. It provides a very rich set of graphing options.