Raul Ochoa
1951e79962
Make assertions compatible
2017-03-07 13:27:13 +01:00
Daniel García Aubert
1e0e31cc1c
Merge branch 'node-v6' of github.com:CartoDB/Windshaft-cartodb into node-v6
2017-03-07 13:02:18 +01:00
Daniel García Aubert
8d35f72fcb
Back to use current assertions as grainstore implements a fallback mechanism when translates styles
2017-03-07 12:59:52 +01:00
Daniel García Aubert
5f3e515131
Back test to use '=~' operator which is now supported by carto@0.15.1-cdb-3 in windshaft
2017-03-07 12:58:06 +01:00
Raul Ochoa
49236fce86
Upgrade locked deps
2017-03-02 11:38:09 +01:00
Raul Ochoa
9d2dde7a5a
Merge branch 'node-v6' into node-v6-yarn
2017-03-02 11:07:52 +01:00
Raul Ochoa
c3e703237c
Merge remote-tracking branch 'origin/master' into node-v6
2017-03-02 11:07:43 +01:00
Mario de Frutos
8868066445
Stubs next version
2017-03-02 11:00:53 +01:00
Mario de Frutos
b446c31cbc
Other category now uses the selected aggregated function ( #633 )
...
* Other category in category widget uses selected aggregation function
Fixes https://github.com/CartoDB/Windshaft-cartodb/issues/628
2017-03-02 10:48:20 +01:00
Raul Ochoa
2d6e7070a6
Stubs next version
2017-02-23 18:12:54 +01:00
Raul Ochoa
473e0cb902
Release 2.88.2
2017-02-23 18:12:14 +01:00
Raul Ochoa
1a8fca0534
Formatting
2017-02-23 18:11:39 +01:00
Raul Ochoa
e24bc12fc9
Merge pull request #632 from CartoDB/upgrade-camshaft
...
Upgrades camshaft to 0.50.2
2017-02-23 18:10:22 +01:00
Raul Ochoa
e77c9141ed
Upgrades camshaft to 0.50.2
2017-02-23 18:00:55 +01:00
Raul Ochoa
321157b17b
Make target to generate shrinkwrap file applying prune
...
It removes dev dependencies from the local node_modules
and avoid getting those into shrinkwrap file.
2017-02-23 17:57:52 +01:00
Raul Ochoa
6ac6574b4c
clean target to completely delete node_modules dir
2017-02-23 17:57:44 +01:00
Raul Ochoa
70ff0a9b8f
Update freezed deps
2017-02-22 19:17:00 +01:00
Raul Ochoa
15bdb57a22
Merge remote-tracking branch 'origin/node-v6' into node-v6-yarn
2017-02-22 19:02:55 +01:00
Raul Ochoa
bb54e5520c
Merge remote-tracking branch 'origin/master' into node-v6
2017-02-22 19:02:27 +01:00
Raul Ochoa
933d486a57
Merge pull request #630 from CartoDB/close-response-timer
...
Close timer for response preparation
2017-02-22 18:46:56 +01:00
Raul Ochoa
8a1c7f5b52
Close timer for response preparation
...
Timer for affectedTables is taking everything from response timing,
adding a tag to represent all the response preparation.
That way affectedTables only represents the time for retrieving the
affected tables themselves.
2017-02-22 18:38:25 +01:00
Rafa de la Torre
822954be5d
Stub next version
2017-02-21 11:06:54 +01:00
Rafa de la Torre
57dc17518c
Release 2.88.1
2017-02-21 11:01:15 +01:00
Mario de Frutos
3df8d4844e
Stubs next version
2017-02-21 08:17:09 +01:00
Mario de Frutos
5a0443618f
Merge pull request #626 from CartoDB/camshaft_v050
...
Camshaft 0.50.0
2017-02-21 08:08:34 +01:00
Raul Ochoa
8a76cd506f
Fix issue with global Promise object
2017-02-20 18:46:48 +01:00
Mario de Frutos
50d05eae47
Version 2.88.0
...
Update camshaft version to 0.50.0
2017-02-20 18:46:47 +01:00
Raul Ochoa
ca41b3b600
Merge pull request #627 from CartoDB/change_release
...
We don't announce release deploy in google groups anymore
2017-02-20 10:31:39 +01:00
Mario de Frutos
43a17ddc7d
We don't announce release deploy in google groups anymore
2017-02-17 18:01:59 +01:00
Mario de Frutos
dfa347f860
Update camshaft dependency to 0.50
2017-02-17 16:29:34 +01:00
Raul Ochoa
6033027812
Merge branch 'node-v6-shrinkwrap' into node-v6-yarn
2017-02-17 13:42:32 +01:00
Raul Ochoa
9ee6f7fbb8
Regenerate npm-shrinkwrap.json with npm@2.x
2017-02-17 13:41:58 +01:00
Raul Ochoa
60c0754800
Make assertions compatible
2017-02-17 13:36:15 +01:00
Raul Ochoa
a9251c5e71
Fix issue with global Promise object
2017-02-17 13:35:41 +01:00
Raul Ochoa
7daeddc946
Use yarn
2017-02-17 11:27:01 +01:00
Raul Ochoa
dbdb00070e
Remove artificial node-zipfile dep
2017-02-17 11:26:46 +01:00
Raul Ochoa
e5c3c282ef
Log Node.js version on startup
2017-02-10 10:03:06 +01:00
Raul Ochoa
caba79b5e2
Make target to generate shrinkwrap file applying prune
...
It removes dev dependencies from the local node_modules
and avoid getting those into shrinkwrap file.
2017-02-07 20:03:47 +01:00
Raul Ochoa
d359ea7fa6
clean target to completely delete node_modules dir
2017-02-07 19:55:37 +01:00
Raul Ochoa
c0abbe570f
Add npm-shrinkwrap.json file
2017-02-07 18:56:45 +01:00
Raul Ochoa
229a2c0c3c
Remove npm-shrinkwrap.json until we solve the issue associated to it
2017-02-07 18:50:57 +01:00
Daniel García Aubert
3f185c9c69
revert: disable cache for ci builds
2017-02-07 15:28:21 +01:00
Daniel García Aubert
f86f72ab27
disable cache for ci builds
2017-02-07 15:19:05 +01:00
Daniel García Aubert
74af17cc65
Add ubuntu toolchain for builds
2017-02-07 12:12:17 +01:00
Daniel García Aubert
aaa3e34c7f
Use gcc 4.9 for build in travis
2017-02-07 11:55:21 +01:00
Daniel García Aubert
a053f198f5
Generate shrinkwrap
2017-02-07 11:45:48 +01:00
Daniel García Aubert
852ba68895
Upgrade redis in dev-dependency
2017-02-07 11:44:53 +01:00
Daniel García Aubert
1b22d176d6
Merge branch 'master' into node-v6
2017-02-06 19:03:16 +01:00
Daniel García Aubert
0ccbedf551
Use updated branch of windshaft
2017-02-06 18:25:32 +01:00
Raul Ochoa
28f1179336
Stubs next version
2017-02-02 16:44:41 +01:00
