Torkel Ödegaard f42b47e65b Merge branch 'master' into export-dashboard ...

Conflicts:
	public/app/features/dashboard/dashnav/dashnav.ts

2016-05-03 10:26:40 +02:00

..

core

fix(annotations): Fixed issue with entering annotation edit view, fixes #4857

2016-04-29 23:14:39 +02:00

features

Merge branch 'master' into export-dashboard

2016-05-03 10:26:40 +02:00

headers

tech(): put in a real event emitter instead of rxjs based on that was broken

2016-04-07 19:47:48 -04:00

partials

feat(): query editors, started work on updated ES query editor

2016-04-17 17:17:30 -04:00

plugins

Merge branch 'master' of github.com:grafana/grafana

2016-05-03 10:25:16 +02:00

app.ts

ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better

2016-02-21 12:47:57 +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

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00