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 |
|
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 |
|