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

..

acceptance

Merge branch 'master' into 257-remove-old-api

2015-03-23 12:24:10 +01:00

fixtures

Add missing fixtures (thanks Fabio)

2013-04-12 14:34:45 +02:00

integration

Use PgConnection to set db auth

2015-02-16 11:57:53 +01:00

monkey

windshaft for cartodb

2011-09-05 00:00:41 +01:00

support

Update CDB_QueryTables

2015-03-09 14:42:30 +01:00

unit/cartodb

Accept 'open' string in templated auth as authorized

2015-01-28 17:29:50 +01:00

benchmark.js

Make benchmarker executable

2012-07-25 18:29:43 +02:00