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

..

api

No capitalize step

2015-03-16 00:21:55 +01:00

backends

No capitalize step

2015-03-16 00:21:55 +01:00

cache

Escape \b for the regex

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

controllers

No capitalize step

2015-03-16 00:21:55 +01:00

models

Datasource to give per-layer authentication in named layers

2015-02-04 11:30:36 +01:00

monitoring

No capitalize step

2015-03-16 00:21:55 +01:00

sql

Triple ===

2015-03-16 00:00:02 +01:00

cache_validator.js

Remove unused vars

2015-03-16 00:16:36 +01:00

cartodb_windshaft.js

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

2015-03-23 12:24:10 +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 257-remove-old-api

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

template_maps.js

Fix Max cyclomatic complexity value

2015-03-16 00:36:38 +01:00