Javier Goizueta 6d30903531 Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation ...

# Conflicts:
#	lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js

2017-12-13 12:53:20 +01:00

..

api

fix forgotten comment

2017-10-05 12:44:03 +02:00

backends

Add query param to define the number of categories to be ranked

2017-11-07 16:14:47 +01:00

cache

Use generic map config adapter

2016-05-23 23:29:06 +02:00

controllers

Merge remote-tracking branch 'origin/master' into mapconfig-aggregation

2017-12-12 17:15:22 +00:00

middleware

Merge branch 'master' into res-locals-user

2017-11-16 11:03:43 +01:00

models

Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation

2017-12-13 12:53:20 +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

Add timer helper

2016-03-18 17:21:43 +01:00

utils

Merge branch 'master' into mapconfig-aggregation

2017-12-11 17:36:58 +01:00

server_options.js

Add configuration flag to enable/disable direct PgSQL MVT

2017-09-28 12:08:22 +02:00

server.js

Do not aggregate if rows cout is lower than threshold or the layer's sql has geometries distinct of points

2017-12-11 17:32:06 +01:00