Raul Ochoa 845ebcac15 Merge branch 'master' into static-controllers ...

Conflicts:
	npm-shrinkwrap.json

2015-01-13 12:45:37 +01:00

..

api

Defaults resultSet to object if undefined in QueryTablesApi

2014-10-13 15:24:14 +02:00

monitoring

Remove query tables api dependency from health check

2015-01-13 12:09:02 +01:00

sql

Moves calls to SQL API to its own entity.

2014-07-30 13:46:46 +02:00

cache_validator.js

Do not send multiple equal commands to Varnish on connect

2014-02-12 16:14:27 +01:00

cartodb_windshaft.js

Remove query tables api dependency from health check

2015-01-13 12:09:02 +01:00

log4js_rollbar.js

Add optional support for rollbar

2014-03-12 17:21:35 +01:00

server_options.js

Remove query tables api dependency from health check

2015-01-13 12:09:02 +01:00

signed_maps.js

Adds support for several auth tokens

2014-07-08 10:35:45 +02:00

template_maps.js

Lock now considers the creation time and compares against a ttl so

2014-09-25 19:00:35 +02:00