Torkel Ödegaard b7a8db4937 Merge branch 'develop' of github.com:grafana/grafana into develop

2017-11-22 14:51:53 +01:00

..

alerting

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

annotations

fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951

2017-11-21 11:28:17 +01:00

cleanup

refactoring: minor refactor of clean up dashboard history PR #9882

2017-11-17 14:41:44 +01:00

guardian

dashboard acl fixes

2017-06-22 17:43:55 -04:00

notifications

Merge pull request #9367 from bobrik/dualstack

2017-09-28 11:15:49 +02:00

provisioning

datasources as cfg: convert yaml map into json for jsonData

2017-11-16 13:23:42 +01:00

search

working on dashboard search

2017-11-20 12:47:03 +01:00

sqlstore

Merge branch 'develop' of github.com:grafana/grafana into develop

2017-11-22 14:51:53 +01:00