Alexander Zobnin 96e9756109 Merge branch 'cache-service' into grafana-3.0 ...

Conflicts:
	plugins/datasource-zabbix/datasource.js

2016-01-16 19:46:36 +03:00

..

partials

Fixed HTTP settings view on data source edit page.

2016-01-16 14:56:03 +03:00

datasource.js

Merge branch 'cache-service' into grafana-3.0

2016-01-16 19:46:36 +03:00

directives.js

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

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

helperFunctions.js

Fixed #138 - Mapping value to text does't work in singlestat panel.

2016-01-14 20:56:24 +03:00

module.js

Working on #142 - fixed plugin.json and

2016-01-16 13:42:12 +03:00

plugin.json

Working on #142 - fixed plugin.json and

2016-01-16 13:42:12 +03:00

queryCtrl.js

Move plugins to separate directories for support Grafana

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

zabbixAPIWrapper.js

Format api response.

2016-01-16 19:36:10 +03:00

zabbixCacheSrv.js

Format api response.

2016-01-16 19:36:10 +03:00