Torkel Ödegaard 49abb205a0 Merge branch 'v3.1.x' ...

Conflicts:
	public/sass/_variables.light.scss

2016-08-01 12:23:36 +02:00

..

core

Enable scaling down seconds unit s > ms > µs > ns (#5642)

2016-07-27 10:10:01 +02:00

lib

feat(plugins): changed what datasources should return, they should now return the datasource constructor

2016-01-09 13:21:16 +01:00

mocks

fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345

2015-12-04 10:32:23 +01:00

specs

fix(tests): fixed unit test broken in recent dynamic dashboard fix

2016-08-01 12:20:16 +02:00

.jshintrc

feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now

2016-03-01 08:43:54 +01:00

test-main.js

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00