Commit Graph
506 Commits
Author SHA1 Message Date
Raul Ochoa efacafaa0d Merge remote-tracking branch 'origin/master' into analysis-layers 2016-04-07 15:04:25 +02:00
Daniel García Aubert c974b91c6b Stubs next version 2016-04-06 19:32:16 +02:00
Daniel García Aubert 6aebe26cc9 Release 2.32.0 2016-04-06 19:29:07 +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 6ceca348cb Stubs next version 2016-03-16 17:40:30 +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 c0370c5703 Stubs next version 2016-03-15 17:45:50 +01:00
Daniel García Aubert 8d5551343b Release 2.30.0 2016-03-15 17:40:26 +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 e7da9a151b Stubs next version 2016-03-14 14:47:02 +01:00
Daniel García Aubert f75ba9d2c3 Release 2.29.0 2016-03-14 14:42:40 +01:00
Daniel García Aubert be61d41f5e Stubs next version 2016-03-14 12:12:56 +01:00
Daniel García Aubert f619a97f1a Release 2.28.0 2016-03-14 12:06:33 +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 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
Raul Ochoa d5fbcfcecb Merge branch 'master' into analysis-layers
Conflicts:
	npm-shrinkwrap.json
2016-03-08 16:06:01 +01:00
Daniel García Aubert ab6004f21e Integrated turbo-cartocss for anonymous maps 2016-03-08 14:34:57 +01:00
Alejandro Martínez 34863765ed Freeze cartodb-query-tables version 2016-03-08 10:05:49 +00: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
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 ba8e3d419e Fix package.json 2016-02-22 15:09:09 +01:00
Raul Ochoa f78c6fbc63 Stubs next version 2016-02-22 13:08:43 +01:00