Commit Graph

5 Commits

Author SHA1 Message Date
Alexander Zobnin
d53d095eb2 Some styles improvements on data source edit page. 2016-01-16 14:52:28 +03:00
Alexander Zobnin
287121d72d Removed metrics limit from settings. 2016-01-16 14:40:09 +03:00
Alexander Zobnin
c7d30e03e4 Merge branch 'feature-text_metrics' into grafana-3.0
Conflicts:
	zabbix/partials/query.editor.html
2016-01-10 22:07:34 +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
72ad872397 Move plugins to separate directories for support Grafana
external plugins model.
2015-12-28 13:08:17 +03:00