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

Conflicts:
	src/app/directives/kibanaPanel.js
	src/app/panels/bettermap/editor.html
	src/app/panels/bettermap/module.js
	src/app/panels/hits/editor.html
	src/app/panels/map/editor.html
	src/app/panels/pie/editor.html
	src/app/panels/table/module.html
	src/app/panels/table/pagination.html
	src/app/panels/terms/editor.html
	src/app/panels/terms/module.js
	src/app/partials/dasheditor.html
	src/css/bootstrap.dark.min.css

2013-12-26 16:41:56 +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

Added revision constant for future use

2013-12-13 16:02:34 -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