Raul Ochoa eec44dd62d Merge branch 'master' into analysis-layers ...

Conflicts:
	npm-shrinkwrap.json
	test/support/test-client.js

2016-03-14 15:13:19 +01:00

..

mapconfig

Moved turbo-cartocss integration from named maps admin to named map provider

2016-03-11 18:28:14 +01:00

analysis_mapconfig_adapter.js

Rename adapter

2016-03-14 11:50:52 +01:00

cdb_request.js

Default host to empty string when header is not found

2015-09-30 16:31:56 +02:00

layergroup_token.js

Ports acceptance tests from windshaft

2015-07-07 23:46:58 +02:00

mapconfig_named_layers_adapter.js

Uses model through model namespace

2015-07-07 23:52:39 +02:00

mapconfig_overviews_adapter.js

Fix: bad error message

2016-02-10 12:27:39 +01:00