Raul Ochoa 43c56af0fc Merge remote-tracking branch 'origin/master' into analysis-layers ...

Conflicts:
	npm-shrinkwrap.json

2016-03-16 16:13:44 +01:00

..

api

Merge branch 'master' into new_querytables_library

2016-03-03 19:30:51 +01:00

backends

Use node-cartodb-query-tables library

2016-02-22 11:40:25 +01:00

cache

Moved turbo-cartocss integration from named maps admin to named map provider

2016-03-11 18:28:14 +01:00

controllers

Merge branch 'master' into analysis-layers

2016-03-14 15:13:19 +01:00

middleware

User extraction from request middleware

2015-09-30 17:17:01 +02:00

models

Merge remote-tracking branch 'origin/master' into analysis-layers

2016-03-16 16:13:44 +01:00

monitoring

Health check will always return error if file is found even if empty

2015-09-22 15:15:57 +02:00

stats

Replaces console.log with global logger

2015-09-18 17:13:22 +02:00

utils

Implemented integration of turbo-cartocss for named maps

2016-03-10 20:45:00 +01:00

server_options.js

Merge branch 'master' into overviews-work

2016-02-09 17:14:08 +01:00

server.js

Moved turbo-cartocss integration from named maps admin to named map provider

2016-03-11 18:28:14 +01:00