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

..

partials

Merge branch 'feature-text_metrics' into grafana-3.0

2016-01-10 22:07:34 +03:00

datasource.js

Merge branch 'feature-text_metrics' into grafana-3.0

2016-01-10 22:07:34 +03:00

directives.js

Issue #72 - changed plugin.json files and fixed templates path

2015-12-28 14:00:03 +03:00

helperFunctions.js

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00

plugin.json

Issue #72 - changed plugin.json files and fixed templates path

2015-12-28 14:00:03 +03:00

queryCtrl.js

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00

zabbixAPIWrapper.js

Move plugins to separate directories for support Grafana

2015-12-28 13:08:17 +03:00