Torkel Ödegaard ece8a925a6 Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

2016-03-11 12:39:10 +01:00

..

cloudwatch

minor fix

2016-03-11 17:04:42 +09:00

elasticsearch

feat(plugins): progress on plugin details page, # 4275

2016-03-07 14:31:17 +01:00

grafana

feat(plugins): made it possible to have relative plugin template urls

2016-02-09 18:17:32 +01:00

graphite

feat(plugins): more work on plugin dashboard install, #4298

2016-03-11 12:31:56 +01:00

influxdb

Fix groupby selection

2016-03-11 08:30:56 +05:00

mixed

fix(mixed datasource): fixed issue with mixed data source in optimized build

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

opentsdb

add annotations for opentsdb

2016-03-08 10:47:36 -05:00

prometheus

feat(prometheus): added special regex escape for prometheus, fixes #4234

2016-03-03 10:49:30 +01:00