Raul Ochoa 6bd967e9fb Merge branch 'master' into medusa-improvements ...

Conflicts:
	lib/cartodb/server_options.js

2015-02-06 12:01:28 +01:00

..

api

Remove no longer needed method from query_tables_api

2015-02-05 17:08:20 +01:00

cache

Escape \b for the regex

2015-01-23 17:22:49 +01:00

controllers

Adds Surrogate Keys to named maps

2015-01-23 16:37:38 +01:00

models

Datasource to give per-layer authentication in named layers

2015-02-04 11:30:36 +01: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

Merge branch 'master' into medusa-improvements

2015-02-06 12:01:28 +01:00

log4js_rollbar.js

Add optional support for rollbar

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

server_options.js

Merge branch 'master' into medusa-improvements

2015-02-06 12:01:28 +01:00

template_maps.js

Removed unused/old template lock functionality

2015-02-04 19:36:16 +01:00