Torkel Ödegaard d0df36433d Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	docs/kibana/configuration/config.js.asciidoc
	src/app/components/settings.js
	src/app/panels/dashcontrol/module.html
	src/app/partials/dasheditor.html
	src/config.js

2013-12-10 11:02:19 +01:00

..

options

started removing kibana stuff I do not need, thinking of doing a custom dashboard based on kibana

2013-12-05 16:45:52 +01:00

build_task.js

Removed dashcontrol, added default_route setting, bumped minimum version

2013-12-06 12:32:38 -07:00

default_task.js

started removing kibana stuff I do not need, thinking of doing a custom dashboard based on kibana

2013-12-05 16:45:52 +01:00

distribute_task.js

Modularize grunt tasks

2013-11-14 16:07:14 -07:00

server_task.js

Added grunt server command

2013-11-15 14:29:27 -07:00