akotynski 0ab31e59f8 Merge remote-tracking branch 'upstream/master' into threshold_regex ...

# Conflicts:
#	dist/datasource-zabbix/datasource.js
#	dist/datasource-zabbix/datasource.js.map
#	dist/datasource-zabbix/specs/test-main.js
#	dist/test/datasource-zabbix/datasource.js
#	dist/test/datasource-zabbix/specs/test-main.js

2017-10-23 14:26:46 +02:00

..

modules

Add dist/ directory to repo to correspond development guide.

2017-02-02 11:33:54 +03:00

datasource_specs.js

upgrade jsdom to newest version so contextify is no longer required, add travis

2017-10-23 14:05:49 +02:00

test-main.js

upgrade jsdom to newest version so contextify is no longer required, add travis

2017-10-23 14:05:49 +02:00

timeseries_specs.js

fix sumSeries() function, closes #286

2017-07-26 16:21:40 +03:00

utils_specs.js

templating: fix queries contained regex with braces, fixes #432

2017-07-25 12:06:37 +03:00