Raul Ochoa 5f6185dd51 Merge branch 'master' into 257-remove-old-api ... Conflicts: lib/cartodb/cartodb_windshaft.js lib/cartodb/server_options.js package.json		2015-03-23 12:24:10 +01:00
..
cache	Remove beforeEach and afterEach, in combination with suite they are	2015-01-30 16:50:06 +01:00
cache_validator.js	Put VarnishEmu in its own module	2012-10-05 16:24:35 +02:00
health_check.js	Remove beforeEach and afterEach, in combination with suite they are	2015-01-30 16:50:06 +01:00
multilayer.js	Adds user param to params whitelist and uses localhost user for tests	2015-03-20 00:30:56 +01:00
named_layers.js	Upgrades windshaft to 0.37.3 and adds a test for named layers and interactivity	2015-02-17 19:28:05 +01:00
server.js	Merge branch 'master' into 257-remove-old-api	2015-02-18 14:51:21 +01:00
templates.js	Run postgresql/sql-api dependant tests against two implementations	2015-02-09 14:33:17 +01:00