Torkel Ödegaard 8c448d95a1 Merge branch 'master' into mtanda-prometheus_table		2017-04-25 12:59:25 +02:00
..
core	fix: make organisation filter case insensitive	2017-04-23 12:30:19 +02:00
features	fix: variable srv addVariable function, only used in tests	2017-04-24 17:06:58 +02:00
headers	Move heatmap panel into core grafana.	2017-03-24 14:18:26 +03:00
partials	create annotations progress	2017-04-14 12:46:02 +02:00
plugins	refactoring: prometheus PR #6140	2017-04-25 12:57:23 +02:00
app.ts	tech(lib upgrade): upgraded angularjs from 1.5.8 to 1.6.1, closes #7274	2017-01-16 21:31:55 +01:00
boot.js	fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster	2016-02-10 06:50:17 +01:00
system.conf.js	Move heatmap panel into core grafana.	2017-03-24 14:18:26 +03:00