Raul Ochoa
|
f6f58a71b3
|
Merge remote-tracking branch 'origin/turbo-carto-substitution-tokens'
Conflicts:
NEWS.md
|
2016-05-17 15:15:07 +02:00 |
|
Francisco Dans
|
163c10b66e
|
upgrades turbo-carto
|
2016-05-17 15:03:48 +02:00 |
|
Raul Ochoa
|
5b96576227
|
Stubs next version
|
2016-05-16 20:08:39 +02:00 |
|
Raul Ochoa
|
503636f9fb
|
Upgrade to turbo-carto 0.9.0
|
2016-05-13 12:09:11 +02:00 |
|
Raul Ochoa
|
bfdaf67a9b
|
Upgrades turbo-carto to 0.8.0
|
2016-05-11 19:57:05 +02:00 |
|
Raul Ochoa
|
e0ade85565
|
Stubs next version
|
2016-05-11 18:53:17 +02:00 |
|
Raul Ochoa
|
2482accb42
|
Upgrades camshaft to 0.8.0
|
2016-05-11 18:39:07 +02:00 |
|
Raul Ochoa
|
bbadd46766
|
Stubs next version
|
2016-05-11 16:47:33 +02:00 |
|
Raul Ochoa
|
cdf3fe3a25
|
Bumps version
|
2016-05-11 16:45:36 +02:00 |
|
Raul Ochoa
|
fc57fd2638
|
Upgrade camshaft to 0.7.0
|
2016-05-11 16:25:42 +02:00 |
|
Raul Ochoa
|
776cb8d47a
|
Stubs next version
|
2016-05-10 17:26:27 +02:00 |
|
Raul Ochoa
|
2ee2c5bb55
|
Update news and bump version
|
2016-05-10 17:22:51 +02:00 |
|
Raul Ochoa
|
e4ba68850c
|
Stubs next version
|
2016-05-05 18:36:50 +02:00 |
|
Raul Ochoa
|
b7d7cffb67
|
Reformat package.json with npm cli tool
|
2016-05-05 16:05:46 +02:00 |
|
Raul Ochoa
|
d5391ef15b
|
Merge remote-tracking branch 'origin/master' into avoid-profiler-dots
Conflicts:
NEWS.md
|
2016-05-05 15:30:12 +02:00 |
|
Francisco Dans
|
5842a239fd
|
shrinkwrap
|
2016-05-05 14:32:57 +02:00 |
|
Raul Ochoa
|
92e130d8de
|
Upgrades step-profiler to 0.3.0 to avoid dots in json keys
Closes #438
|
2016-05-05 13:45:25 +02:00 |
|
Francisco Dans
|
0542b65cbb
|
shrinkwrap changes for 2.38.0
|
2016-05-05 12:26:12 +02:00 |
|
Daniel García Aubert
|
6902a8c9b3
|
Upgraded camashaft version to 0.6.0
|
2016-05-03 17:46:38 +02:00 |
|
Raul Ochoa
|
c19a345f6c
|
Stubs next version
|
2016-04-29 12:54:47 +02:00 |
|
Raul Ochoa
|
412712e62e
|
Upgrades camshaft to 0.5.1
|
2016-04-29 12:51:39 +02:00 |
|
Raul Ochoa
|
0edcb30f75
|
Stubs next version
|
2016-04-28 18:46:49 +02:00 |
|
Raul Ochoa
|
b926244085
|
Upgrades windshaft to 1.19.0
|
2016-04-28 17:30:57 +02:00 |
|
Raul Ochoa
|
d21136b475
|
Stubs next version
|
2016-04-27 18:44:47 +02:00 |
|
Raul Ochoa
|
120e800089
|
Bump version and update news
|
2016-04-27 18:42:56 +02:00 |
|
Raul Ochoa
|
755dfe6822
|
Append dataviews related columns to layers
|
2016-04-27 18:30:05 +02:00 |
|
Daniel García Aubert
|
fe0b0a9c50
|
Upgraded windshaft to 1.17.3
|
2016-04-27 15:05:45 +02:00 |
|
Raul Ochoa
|
dea19f20dd
|
Stubs next version
|
2016-04-27 10:24:16 +02:00 |
|
Raul Ochoa
|
5da8929a5d
|
Upgrade windshaft
|
2016-04-26 19:13:10 +02:00 |
|
Raul Ochoa
|
dd731399dc
|
Starts using turbo-carto dependency
|
2016-04-26 16:28:05 +02:00 |
|
Raul Ochoa
|
92795963ae
|
Stubs next version
|
2016-04-20 17:26:30 +02:00 |
|
Raul Ochoa
|
e1c5af8602
|
Bump version and update news
|
2016-04-20 17:15:17 +02:00 |
|
Raul Ochoa
|
41ead9664b
|
Upgrade camshaft to 0.5.0
|
2016-04-20 16:34:48 +02:00 |
|
Raul Ochoa
|
d910f5ef3e
|
Update camshaft to use 0.4.0 fixed version
|
2016-04-20 15:33:04 +02:00 |
|
Raul Ochoa
|
3a81302699
|
Merge branch 'master' into analysis-layers
Conflicts:
package.json
|
2016-04-18 14:36:43 +02:00 |
|
Raul Ochoa
|
1ed0c73525
|
Upgrades cartodb-psql to 0.6.1 version.
|
2016-04-18 14:30:20 +02:00 |
|
Raul Ochoa
|
7175b2b05e
|
Merge branch 'master' into analysis-layers
|
2016-04-18 14:09:57 +02:00 |
|
Raul Ochoa
|
b53031972e
|
Upgrades windshaft to 1.17.1
|
2016-04-18 13:18:54 +02:00 |
|
Raul Ochoa
|
efacafaa0d
|
Merge remote-tracking branch 'origin/master' into analysis-layers
|
2016-04-07 15:04:25 +02:00 |
|
Daniel García Aubert
|
f93794717e
|
Upgrades windshaft to 1.17.0
|
2016-04-06 19:26:55 +02:00 |
|
Raul Ochoa
|
4d39d30f6e
|
Merge branch 'master' into analysis-layers
Conflicts:
npm-shrinkwrap.json
|
2016-03-23 16:09:28 +01:00 |
|
Raul Ochoa
|
9a8964bd39
|
Stubs next version
|
2016-03-23 15:14:52 +01:00 |
|
Raul Ochoa
|
5fe96a618d
|
Upgrade windshaft to 1.16.1
|
2016-03-23 15:01:30 +01:00 |
|
Raul Ochoa
|
7b7e9ffe59
|
Upgrade cartodb-psql module to get some bufixes
|
2016-03-23 12:13:26 +01:00 |
|
Raul Ochoa
|
a769545e39
|
Rely on camshaft.reference for now
|
2016-03-18 17:16:51 +01:00 |
|
Raul Ochoa
|
df40302fd0
|
Add camshaft-reference
|
2016-03-18 13:04:00 +01:00 |
|
Daniel García Aubert
|
366a66b331
|
Release 2.31.0
|
2016-03-16 17:30:58 +01:00 |
|
Raul Ochoa
|
43c56af0fc
|
Merge remote-tracking branch 'origin/master' into analysis-layers
Conflicts:
npm-shrinkwrap.json
|
2016-03-16 16:13:44 +01:00 |
|
Daniel García Aubert
|
4089e8537a
|
Upgraded windshaft to version 1.15.0
|
2016-03-15 17:35:13 +01:00 |
|
Raul Ochoa
|
eec44dd62d
|
Merge branch 'master' into analysis-layers
Conflicts:
npm-shrinkwrap.json
test/support/test-client.js
|
2016-03-14 15:13:19 +01:00 |
|
Daniel García Aubert
|
f75ba9d2c3
|
Release 2.29.0
|
2016-03-14 14:42:40 +01:00 |
|
Raul Ochoa
|
1535820d4f
|
Regenerate npm-shrinkwrap.json
|
2016-03-10 11:32:43 +01:00 |
|
Raul Ochoa
|
b2378939c5
|
Merge branch 'master' of github.com:CartoDB/Windshaft-cartodb into analysis-layers
|
2016-03-10 11:14:10 +01:00 |
|
Raul Ochoa
|
050f90a07b
|
Regenerate npm-shrinkwrap.json
|
2016-03-09 18:11:34 +01:00 |
|
Raul Ochoa
|
c1642dfa73
|
Merge branch 'master' into move-turbo-cartocss
Conflicts:
lib/cartodb/controllers/map.js
|
2016-03-09 18:08:46 +01:00 |
|
Alejandro Martínez
|
cf8ce42049
|
Release 2.27.0
|
2016-03-09 17:57:18 +01:00 |
|
Daniel García Aubert
|
eefa9f4222
|
Merge branch 'master' into move-turbo-cartocss
|
2016-03-09 12:03:29 +01:00 |
|
Daniel García Aubert
|
c6fbb08c8f
|
Regenerated npm-shrinkwrap
|
2016-03-09 10:36:57 +01:00 |
|
Raul Ochoa
|
d5fbcfcecb
|
Merge branch 'master' into analysis-layers
Conflicts:
npm-shrinkwrap.json
|
2016-03-08 16:06:01 +01:00 |
|
Raul Ochoa
|
9d77aea6be
|
Regenerate npm-shrinkwrap.json
|
2016-03-08 15:23:56 +01:00 |
|
Alejandro Martínez
|
34863765ed
|
Freeze cartodb-query-tables version
|
2016-03-08 10:05:49 +00:00 |
|
Raul Ochoa
|
f504807812
|
Regenerate npm-shrinkwrap.json
|
2016-03-04 12:12:12 +01:00 |
|
Raul Ochoa
|
c7bdabfc65
|
Merge branch 'new_querytables_library' into analysis-layers
|
2016-03-04 12:08:57 +01:00 |
|
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 |
|
Raul Ochoa
|
94c7bc41be
|
Merge branch 'master' into new_querytables_library
|
2016-03-03 19:30:51 +01:00 |
|
Javier Goizueta
|
6c3fde70e8
|
Stub next version
|
2016-03-03 19:05:06 +01:00 |
|
Javier Goizueta
|
b2539f52b8
|
Release 2.26.3
|
2016-03-03 19:01:40 +01:00 |
|
Raul Ochoa
|
3709d1f1d5
|
Merge branch 'master' into analysis-layers
|
2016-02-25 11:46:41 +01:00 |
|
Raul Ochoa
|
1789993467
|
Stubs next version
|
2016-02-25 11:43:36 +01:00 |
|
Raul Ochoa
|
2818413c5a
|
Update windshaft to 1.13.2
|
2016-02-25 11:42:28 +01:00 |
|
Raul Ochoa
|
e958f925d3
|
Merge branch 'master' into analysis-layers
|
2016-02-24 17:28:03 +01:00 |
|
Raul Ochoa
|
06164af17f
|
Stubs next version
|
2016-02-24 17:23:15 +01:00 |
|
Raul Ochoa
|
7894acf830
|
Upgrade windshaft to 1.13.1
|
2016-02-24 17:16:30 +01:00 |
|
Raul Ochoa
|
d923b343fc
|
Merge branch 'master' into analysis-layers
|
2016-02-24 10:56:19 +01:00 |
|
Raul Ochoa
|
86c6f6040d
|
Stubs next version
|
2016-02-24 10:51:12 +01:00 |
|
Raul Ochoa
|
b9d2e297b6
|
Merge branch 'master' of github.com:CartoDB/Windshaft-cartodb into analysis-layers
|
2016-02-24 10:35:28 +01:00 |
|
Raul Ochoa
|
f6f9f203d2
|
Update news and bump version
|
2016-02-24 02:21:37 +01:00 |
|
Raul Ochoa
|
f6c519a9e7
|
Upgrade windshaft to 1.13.0
|
2016-02-24 02:18:55 +01:00 |
|
Alejandro Martínez
|
dcf156ba21
|
Merge remote-tracking branch 'origin/master' into new_querytables_library
|
2016-02-23 19:20:10 +01:00 |
|
Raul Ochoa
|
b931178e59
|
Upgrade windshaft and regenerate npm-shrinkwrap.json
|
2016-02-23 17:06:34 +01:00 |
|
Alejandro Martínez
|
e491c0b825
|
Rename node-cartodb-query-tables to cartodb-query-tables
|
2016-02-22 19:11:54 +01:00 |
|
Raul Ochoa
|
2ac2974414
|
Stubs next version
|
2016-02-22 18:02:29 +01:00 |
|
Alejandro Martínez
|
37fcfe69c7
|
Merge remote-tracking branch 'origin/master' into new_querytables_library
|
2016-02-22 15:35:36 +01:00 |
|
Alejandro Martínez
|
2d6ee93448
|
Delete query_tables_api.js, wrap shrinkwrap
|
2016-02-22 13:40:20 +00:00 |
|
Raul Ochoa
|
f78c6fbc63
|
Stubs next version
|
2016-02-22 13:08:43 +01:00 |
|
Raul Ochoa
|
dcfa38e29c
|
Upgrade windshaft to 1.11.1
|
2016-02-22 12:46:51 +01:00 |
|
Raul Ochoa
|
ae8e3f2ef8
|
Merge branch 'master' into analysis-layers
|
2016-02-19 15:45:56 +01:00 |
|
Raul Ochoa
|
3161939de9
|
Stubs next version
|
2016-02-18 15:15:09 +01:00 |
|
Raul Ochoa
|
b3f62e1631
|
Update news and bump version
|
2016-02-18 14:27:44 +01:00 |
|
Raul Ochoa
|
65e539d4c8
|
Upgrade windshaft
|
2016-02-18 13:49:10 +01:00 |
|
Raul Ochoa
|
4db2c715a0
|
Merge branch 'master' into analysis-layers
Conflicts:
npm-shrinkwrap.json
package.json
|
2016-02-17 11:29:11 +01:00 |
|
Raul Ochoa
|
121c146ef9
|
Stubs next version
|
2016-02-15 14:47:36 +01:00 |
|
Raul Ochoa
|
d0f84b2440
|
windshaft@1.10.1
|
2016-02-15 13:22:35 +01:00 |
|
Raul Ochoa
|
fe5c6faff1
|
Upgrade windshaft to 1.10.0
|
2016-02-15 12:16:56 +01:00 |
|
Raul Ochoa
|
2f51ad9c3f
|
Regenerate npm-shrinkwrap.json to include camshaft dep
|
2016-02-12 18:49:01 +01:00 |
|
Raul Ochoa
|
f71d38fb79
|
Stubs next version
|
2016-02-12 16:06:20 +01:00 |
|
Javier Goizueta
|
ba0cf1eddf
|
Release 2.23.0
|
2016-02-10 13:07:12 +01:00 |
|
Javier Goizueta
|
bbb8841f5a
|
Upgrade Windshaft to 1.9.0
This version supports the current (provisional) QueryRewriter interface
|
2016-02-09 17:31:10 +01:00 |
|
Daniel García Aubert
|
0606fca484
|
Release 2.22.0
|
2016-02-08 18:31:28 +01:00 |
|
Raul Ochoa
|
d005521aa4
|
Upgrade windshaft version
|
2016-02-04 19:06:54 +01:00 |
|
Daniel García Aubert
|
3284e709c3
|
Regenerate npm-shrinkwrap
|
2016-02-04 17:00:44 +01:00 |
|
Daniel García Aubert
|
feef31d1bf
|
Merge branch 'geojson-renderer' of github.com:CartoDB/Windshaft-cartodb into geojson-renderer
|
2016-01-29 15:36:47 +01:00 |
|
Raul Ochoa
|
e4e7d6c840
|
Stubs next version
|
2016-01-20 12:26:16 +01:00 |
|
Raul Ochoa
|
1e8525162a
|
Bump version
|
2016-01-20 12:22:56 +01:00 |
|
Raul Ochoa
|
9c2fe9eac4
|
Upgrade windshaft to 1.7.0
|
2016-01-20 11:39:53 +01:00 |
|
Raul Ochoa
|
e72bd77265
|
Merge branch 'master' into geojson-renderer
Conflicts:
npm-shrinkwrap.json
package.json
|
2016-01-18 14:52:01 +01:00 |
|
Raul Ochoa
|
fbc1bccb48
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
|
2016-01-18 14:32:33 +01:00 |
|
Raul Ochoa
|
b5b881e662
|
Regenerate npm-shrinkwrap.json
|
2016-01-18 14:24:23 +01:00 |
|
Raul Ochoa
|
5eeaa0272c
|
Use master branch from windshaft and regenerate npm-shrinkwrap.json
|
2016-01-15 16:01:01 +01:00 |
|
Raul Ochoa
|
3e601cc2e6
|
Use geojson renderer branch from windshaft
|
2016-01-15 15:53:40 +01:00 |
|
Raul Ochoa
|
ad566d8ff0
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-24 13:36:39 +01:00 |
|
Raul Ochoa
|
67ba517a0e
|
Stubs next version
|
2015-11-23 16:08:32 +01:00 |
|
Raul Ochoa
|
152440e611
|
Upgrade windshaft to 1.6.1
Regenerates npm-shrinkwrap.json, including bump in torque.js@2.11.4
|
2015-11-23 15:51:57 +01:00 |
|
Raul Ochoa
|
0a38549c55
|
Regenerate npm-shrinkwrap.json
|
2015-11-23 11:00:55 +01:00 |
|
Raul Ochoa
|
37ff13493c
|
Use mapconfig-extension from windshaft
|
2015-11-16 12:23:05 +01:00 |
|
Raul Ochoa
|
9264f4a668
|
Re-adds npm-shrinkwrap.json
|
2015-11-16 12:13:54 +01:00 |
|
Raul Ochoa
|
4c851a0d09
|
Remove npm-shrinkwrap.json to ease development
|
2015-11-13 10:35:30 +01:00 |
|
Raul Ochoa
|
86abc392a1
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-12 11:38:42 +01:00 |
|
Raul Ochoa
|
9e00cb3309
|
Stubs next version
|
2015-11-12 11:30:58 +01:00 |
|
Raul Ochoa
|
3dbcf5f293
|
Upgrade windshaft/mapnik
|
2015-11-11 16:28:21 +01:00 |
|
Raul Ochoa
|
663703abae
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-11-02 11:13:34 +01:00 |
|
Raul Ochoa
|
5844c031c9
|
Stubs next version
|
2015-11-02 10:55:57 +01:00 |
|
Raul Ochoa
|
479861e612
|
Update news
|
2015-10-29 18:31:15 +01:00 |
|
Raul Ochoa
|
a746445b88
|
Upgrade windshaft to 1.5.0
|
2015-10-29 18:30:02 +01:00 |
|
Raul Ochoa
|
3b9759d5e4
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-28 19:41:44 +01:00 |
|
Raul Ochoa
|
a20a1f692b
|
Stubs next version
|
2015-10-28 19:27:53 +01:00 |
|
Raul Ochoa
|
ee39450864
|
Regenerate npm-shrinkwrap.json
|
2015-10-28 19:21:22 +01:00 |
|
Raul Ochoa
|
3fa4f8573e
|
Upgrades windshaft to 1.3.0
|
2015-10-28 16:31:11 +01:00 |
|
Raul Ochoa
|
50e63bf83d
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-26 17:06:13 +01:00 |
|
Raul Ochoa
|
2f592e6f62
|
Stubs next version
|
2015-10-22 16:28:49 +02:00 |
|
Raul Ochoa
|
d7181ec6c2
|
Upgrades windshaft to 1.2.0
|
2015-10-21 18:38:19 +02:00 |
|
Raul Ochoa
|
7761f56d36
|
Stubs next version
|
2015-10-21 13:58:26 +02:00 |
|
Raul Ochoa
|
12175f10a6
|
Upgrades windshaft to 1.1.1
|
2015-10-21 13:55:36 +02:00 |
|
Raul Ochoa
|
52dbe14af2
|
Merge branch 'master' into mapconfig-extension
Conflicts:
npm-shrinkwrap.json
package.json
|
2015-10-13 16:06:04 +02:00 |
|
Raul Ochoa
|
01bd09040e
|
Stubs next version
|
2015-10-13 12:44:29 +02:00 |
|
Raul Ochoa
|
6effcfb62e
|
Upgrades windshaft to 1.1.0 and fastly-purge to 1.0.1
|
2015-10-09 15:50:39 +02:00 |
|
Raul Ochoa
|
59fb1dea54
|
Start using mapconfig-extension branch from windshaft
|
2015-10-06 18:55:27 +02:00 |
|
Raul Ochoa
|
2cc4cc5deb
|
Stubs next version
|
2015-09-30 19:26:33 +02:00 |
|
Raul Ochoa
|
e7aa6bbdf9
|
Upgrade windshaft
|
2015-09-30 17:44:40 +02:00 |
|
Raul Ochoa
|
ba6b8fbff1
|
Stubs next version
|
2015-09-30 11:28:38 +02:00 |
|
Raul Ochoa
|
ff561157ac
|
Use Windshaft from registry
|
2015-09-30 11:21:25 +02:00 |
|
Raul Ochoa
|
a7cf9fd74f
|
Regenerate npm-shrinkwrap.json
|
2015-09-30 11:04:40 +02:00 |
|
Raul Ochoa
|
f9e3870941
|
Update news with all changes related to use Windshaft as library
|
2015-09-30 00:59:42 +02:00 |
|
Raul Ochoa
|
6a38defac5
|
Use Windshaft master branch
|
2015-09-29 19:42:13 +02:00 |
|
Raul Ochoa
|
8dca835a8e
|
Regenerate npm-shrinkwrap.json
|
2015-09-29 12:58:48 +02:00 |
|
Raul Ochoa
|
17458f3f4e
|
Use windshaft's backend-foundations branch as it already has mvt support
|
2015-09-22 14:13:09 +02:00 |
|
Raul Ochoa
|
e87fc8a839
|
Merge branch 'standalone-server' into standalone-server-mvt
|
2015-09-22 12:28:16 +02:00 |
|
Raul Ochoa
|
6cf4d53b7c
|
Merge branch 'master' into standalone-server
Conflicts:
lib/cartodb/controllers/named_static_maps.js
|
2015-09-21 23:55:17 +02:00 |
|
Raul Ochoa
|
619545b993
|
Stubs next version
|
2015-09-21 22:49:06 +02:00 |
|
Raul Ochoa
|
77a5b70576
|
Update news and bump version
|
2015-09-21 22:43:33 +02:00 |
|