Torkel Ödegaard f6b52cd6d7 Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders

2017-06-22 15:16:57 -04:00

..

alerting

dashfolders: allows phantomjs rendering for alerting

2017-06-22 02:43:33 +02:00

annotations

annotation: added region support to annoations

2017-04-12 16:26:34 +02:00

cleanup

fix(cleanup): check if images dir exists

2016-09-28 21:12:25 +02:00

eventpublisher

no unbound recursion in publish()

2015-05-18 10:04:01 -04:00

guardian

dashboard acl stuff

2017-06-21 19:23:24 -04:00

notifications

fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093

2017-04-25 13:16:41 +02:00

search

refactoring dashoard folder guardian

2017-06-17 18:24:38 -04:00

sqlstore

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

2017-06-22 15:16:57 -04:00