Raul Ochoa 16a7c4fa3d Merge branch 'master' into new_querytables_library ...

Conflicts:
	test/support/prepare_db.sh
	test/support/sql/CDB_QueryStatements.sql

2016-03-04 00:39:14 +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

Drop old QueryTablesApi

2016-02-22 15:26:06 +01:00

controllers

Just callback as result is handled internally

2016-03-03 19:25:32 +01:00

middleware

User extraction from request middleware

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

models

Rename node-cartodb-query-tables to cartodb-query-tables

2016-02-22 19:11:54 +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

Change form of overviews queries so they can be optimized

2016-03-02 19:25:08 +01:00

server_options.js

Merge branch 'master' into overviews-work

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

server.js

Drop old QueryTablesApi

2016-02-22 15:26:06 +01:00