Commit Graph

5 Commits

Author SHA1 Message Date
Alexander Zobnin
1f70b10b38 Some refactoring of annotationQuery() method. 2016-01-09 21:48:16 +03:00
Alexander Zobnin
84dd066aac Merge branch 'develop' into panel-triggers
Conflicts:
	plugins/datasource-zabbix/datasource.js
2016-01-09 21:42:31 +03:00
Alexander Zobnin
e6c7046d07 Issue #133 - fixed time range parse. 2015-12-28 22:07:16 +03:00
Alexander Zobnin
7aa38e22db Fixed #133 - Annotations don't work at Grafana 2.6. 2015-12-28 14:15:21 +03:00
Alexander Zobnin
72ad872397 Move plugins to separate directories for support Grafana
external plugins model.
2015-12-28 13:08:17 +03:00