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
Raul Ochoa
486cafba9d
re-generate npm-shrinkwrap.json
2015-09-18 03:06:26 +02:00
Raul Ochoa
e9e95eda0a
Merge branch 'standalone-server' into standalone-server-mvt
2015-09-18 02:31:38 +02:00
Raul Ochoa
5e27f981de
Regenerate npm-shrinkwrap.json
2015-09-18 01:58:47 +02:00
Raul Ochoa
c97f78bb39
Merge branch 'standalone-server' into standalone-server-mvt
...
Conflicts:
npm-shrinkwrap.json
package.json
2015-09-18 01:34:14 +02:00
Raul Ochoa
beabe48aec
Upgrade express, adds body-parser
...
- basic changes in server
- basic changes in unit tests
2015-09-17 00:19:00 +02:00
Raul Ochoa
a176ddbf3f
Regenerate npm-shrinkwrap.json
2015-09-16 13:25:57 +02:00
Raul Ochoa
1c6571d1db
Upgrade dependencies and regenerate npm-shrinkwrap.json
...
Surrogate keys tests sleeping :-(
2015-09-16 13:17:03 +02:00
Raul Ochoa
bf7b35230f
Regenerate npm-shrinkwrap.json
2015-09-16 11:44:12 +02:00
Raul Ochoa
46d901ada7
Merge branch 'standalone-server' into standalone-server-mvt
2015-09-16 11:09:27 +02:00
Raul Ochoa
2d3088ba27
Port everything related to stats from windshaft
2015-09-14 18:47:01 +02:00
Raul Ochoa
b2e1e5361f
Merge branch 'standalone-server' into standalone-server-mvt
...
Conflicts:
npm-shrinkwrap.json
2015-09-08 15:46:23 +02:00
Raul Ochoa
f96c80d7a1
Merge branch 'master' into standalone-server
...
Conflicts:
lib/cartodb/cartodb_windshaft.js
2015-09-08 15:42:30 +02:00
Raul Ochoa
c56ef8e0da
Merge branch 'master' into standalone-server
...
Conflicts:
app.js
npm-shrinkwrap.json
package.json
2015-08-28 13:54:56 +02:00
Raul Ochoa
bb17609ea3
Stubs next version
2015-08-27 17:48:06 +02:00
Raul Ochoa
fa85dcbc4c
Upgrades windshaft to 0.51.0
2015-08-27 17:24:38 +02:00
Raul Ochoa
0561a28a4d
Make http and https globalAgent options configurable
2015-08-27 16:28:16 +02:00
Raul Ochoa
b3467116fe
Stubs next version
2015-08-26 09:55:15 +02:00
Raul Ochoa
627bc672bc
Upgrades windshaft to 0.50.0
2015-08-25 19:27:00 +02:00
Raul Ochoa
bf4844e664
Stubs next version
2015-08-18 16:35:02 +02:00
Raul Ochoa
b77be76f51
Bump version and add news
2015-08-18 15:22:27 +02:00
Raul Ochoa
37dfd8fc12
Upgrade windshaft
2015-08-18 15:18:44 +02:00
Raul Ochoa
de2719b0c5
Stubs next version
2015-08-06 18:03:00 +02:00
Raul Ochoa
2e063cc2d2
Send memory usage stats
2015-08-06 16:06:42 +02:00
Raul Ochoa
909f8da2ff
Adds lru cache for layergroups and named maps mapconfig provider
2015-07-15 16:51:26 +02:00
Raul Ochoa
e7284262e4
Merge branch 'master' into standalone-server
...
Conflicts:
npm-shrinkwrap.json
package.json
2015-07-15 12:20:12 +02:00
Raul Ochoa
decd9077e4
Stubs next version
2015-07-15 11:44:59 +02:00
Raul Ochoa
7a5928d957
Upgrades windshaft to 0.48.0
2015-07-15 11:31:26 +02:00
Raul Ochoa
a50af0ee64
Merge branch 'master' into standalone-server
2015-07-14 16:36:26 +02:00
Raul Ochoa
436c334f5a
Stubs next version
2015-07-14 16:33:12 +02:00
Raul Ochoa
962ac97433
regenerate npm-shrinkwrap.json
2015-07-13 12:52:12 +02:00
Raul Ochoa
9491b81d0c
Standalone server with MVT support
2015-07-13 12:34:52 +02:00
Raul Ochoa
8a036c79c7
Merge branch 'master' into standalone-server
...
Conflicts:
app.js
2015-07-07 12:36:39 +02:00
Raul Ochoa
7614f72df6
Stubs next version
2015-07-06 11:58:08 +02:00
Raul Ochoa
ccd3d0a3bf
Merge branch 'named-maps-tiles' into standalone-server
...
Conflicts:
app.js
2015-07-06 02:55:13 +02:00
Raul Ochoa
a9f24542d5
regenerate npm-shrinkwrap.json
2015-07-06 02:09:06 +02:00
Raul Ochoa
feec7805af
Merge branch 'master' into named-maps-tiles
...
Conflicts:
npm-shrinkwrap.json
package.json
2015-07-06 01:32:33 +02:00
Raul Ochoa
19f488095b
Stubs next version
2015-07-06 01:07:30 +02:00
Raul Ochoa
27ff1ac4f6
Upgrades windshaft to 0.47.0
2015-07-05 21:16:12 +02:00
Raul Ochoa
bf24347328
Exposes redis noReadyCheck config
2015-07-05 20:59:52 +02:00
Raul Ochoa
7a5d73f9df
Upgrades redis-mpool
2015-07-05 20:58:39 +02:00
Raul Ochoa
0d9f34fd48
Stubs next version
2015-07-02 15:48:58 +02:00
Raul Ochoa
333334e598
Upgrades windshaft
2015-07-02 15:41:48 +02:00
Raul Ochoa
7168e4410c
Stubs next version
2015-07-02 14:12:41 +02:00
Raul Ochoa
75ddcbbd01
Updates windshaft to 0.46.0 and documents new config formatMetatile
2015-07-02 13:28:37 +02:00
Raul Ochoa
4f87796e9c
Uses backend-foundations branch to use createLayergroup from backend
2015-06-29 18:58:58 +02:00
Raul Ochoa
849470a3c0
Stubs next version
2015-06-18 12:55:38 +02:00
Raul Ochoa
61c134215a
Bumps version and regenerates npm-shrinkwrap.json
2015-06-18 12:29:02 +02:00
Raul Ochoa
5f2d5931f4
Regenerate npm-shrinkwrap.json using master branch
2015-06-12 15:48:03 +02:00
Raul Ochoa
ebae218219
Use windshaft branch with unified error reponses format
2015-06-05 13:37:49 -04:00
Raul Ochoa
aa3b336e46
Stubs next version
2015-06-01 15:50:53 +02:00
Raul Ochoa
e5fff6b452
Merge branch 'master' into upgrade-windshaft
2015-06-01 14:19:49 +02:00
Raul Ochoa
044d49c53a
Uses windshaft 0.44.1 from registry
2015-06-01 12:20:44 +02:00
Raul Ochoa
69abf8d9b1
uses windshaft's master branch
2015-06-01 11:35:57 +02:00
Raul Ochoa
654905a79c
Stubs next version
2015-05-26 15:53:07 +02:00
Raul Ochoa
7a45c9e434
Bumps windshaft version to 0.44.0
...
- adds a test to validate metadata is returned for unrolled named layers
2015-05-26 15:39:21 +02:00
Raul Ochoa
9ee69dea55
Stubs next version
2015-05-18 18:11:48 +02:00
Raul Ochoa
ebe38e977f
Release 2.3.0
2015-05-18 18:10:47 +02:00
Raul Ochoa
875159fa5f
Upgrades cartodb-redis for global map stats
2015-05-18 17:40:41 +02:00
Raul Ochoa
682db1ca75
Stubs next version
2015-04-29 15:26:56 +02:00
Raul Ochoa
5a9a2d7449
Use windshaft's registry version
2015-04-29 10:21:23 +02:00
Raul Ochoa
8d200686fd
regenerate npm-shrinkwrap.json
2015-04-29 09:59:36 +02:00
Raul Ochoa
5a476f9354
Adds fastly-purge dependency
2015-04-27 16:18:03 +02:00
Raul Ochoa
403039b695
Adds new configuration examples for fastly surrogate keys invalidation
2015-04-27 16:17:13 +02:00
Raul Ochoa
eaf6775d9d
Stubs next version
2015-04-16 18:06:55 +02:00
Raul Ochoa
5577600903
Upgrade windshaft and regenerate npm-shrinkwrap.json
2015-04-16 17:48:59 +02:00
Raul Ochoa
a0a455b225
Stubs next version
2015-04-15 16:13:40 +02:00
Raul Ochoa
e2fd4aca60
Upgrade windshaft
2015-04-15 15:32:10 +02:00
Raul Ochoa
95aa74ee34
Stubs next version
2015-04-10 10:57:31 +02:00
Raul Ochoa
7cd78be094
Stubs next version
2015-04-09 15:26:21 +02:00
Raul Ochoa
d143b0235b
Upgrades windshaft to 0.42.0
2015-04-09 15:23:42 +02:00
Raul Ochoa
9b122280e1
Stubs next version
2015-04-08 12:27:40 +02:00
Raul Ochoa
47cc1de89b
Uses windshaft@0.41.0 registry version
2015-04-07 17:57:21 +02:00
Raul Ochoa
69c623b5b2
Regenerate npm-shrinkwrap.json
2015-04-07 14:36:43 +02:00
Raul Ochoa
1782f240ce
Upgrade cartodb-redis package
2015-04-07 11:38:00 +02:00
Raul Ochoa
f0eeb393d6
Use windshaft render-limits branch
...
Bump cartodb-redis version
Regenerate npm-shrinkwrap.json as I accidentaly deleted it
2015-04-01 15:49:01 +02:00
Raul Ochoa
400e51f13a
Removes rollbar as optional logger
2015-03-31 11:36:29 +02:00
Raul Ochoa
e0413c3302
Prepared next release
2015-03-30 18:44:44 +02:00
Raul Ochoa
cd79fc606b
Regenerate npm-shrinkwrap.json
2015-03-30 17:57:27 +02:00
Raul Ochoa
0321884795
Re-generate npm-shrinkwrap.json to use windshaft/master.
...
A lot of tests from acceptance/server.js will fail
2015-03-23 12:29:42 +01:00
Raul Ochoa
75a980ff1d
Stubs next version
2015-03-11 17:15:44 +01:00
Raul Ochoa
8e9d9113d7
Upgrades windshaft to 0.40.0
2015-03-11 16:19:07 +01:00
Raul Ochoa
1979697551
Stubs next version
2015-03-09 14:08:38 +01:00
Raul Ochoa
cfe434c8ed
Use published version
2015-03-09 13:52:47 +01:00
Raul Ochoa
e82131f4e8
Upgrades windshaft@0.39.0
2015-03-06 10:45:01 +01:00
Raul Ochoa
f006d09f31
Update windshaft to version 0.38.2
2015-02-26 12:08:48 +01:00
Raul Ochoa
6ae2c2630a
Upgrade windshaft to 0.38.1
2015-02-25 19:15:55 +01:00
Raul Ochoa
a287c84500
Upgrades windshaft to 0.38.0
2015-02-23 12:59:00 +01:00
Raul Ochoa
1771313bea
Stubs next version
2015-02-20 10:32:12 +01:00
Raul Ochoa
10acdc4615
Upgrades windshaft to 0.37.5
2015-02-20 10:30:11 +01:00
Raul Ochoa
5da239a2eb
Stubs next version
2015-02-18 11:55:35 +01:00
Raul Ochoa
27d6d636cf
Upgrades to windshaft 0.37.4
2015-02-18 11:53:56 +01:00
Raul Ochoa
5db7f002e6
Stubs next version
2015-02-17 19:44:23 +01:00
Raul Ochoa
7f20e296a3
Upgrades windshaft to 0.37.3 and adds a test for named layers and interactivity
...
Closes #263
2015-02-17 19:28:05 +01:00
Raul Ochoa
dc14248de2
Stubs next version
2015-02-17 16:17:32 +01:00
Raul Ochoa
11db363bfb
Upgrades windshaft to 0.37.2
2015-02-17 16:07:49 +01:00
Raul Ochoa
d2961430f3
Stubs next version
2015-02-17 12:20:51 +01:00
Raul Ochoa
055932d38e
Upgrades windshaft to 0.37.1
2015-02-17 12:19:16 +01:00
Raul Ochoa
c65a29acf4
Stubs next version
2015-02-17 11:04:41 +01:00
Raul Ochoa
27cda49fd8
Release 1.28.0
2015-02-17 11:02:29 +01:00
Raul Ochoa
1f9387bb68
Rely on published versions
2015-02-16 15:02:39 +01:00
Raul Ochoa
00542bbc57
Upgrades windshaft to 0.37.0
2015-02-16 14:57:03 +01:00
Raul Ochoa
f295f847d1
Stubs next version
2015-02-16 12:15:08 +01:00
Raul Ochoa
0478905689
Release 1.27.0
2015-02-16 12:14:24 +01:00
Raul Ochoa
c6d328ee07
Upgrades to windshaft 0.36.0
2015-02-16 10:55:38 +01:00
Raul Ochoa
0f668aabf1
Rely on windshaft's master branch as everything for medusa is already there
2015-02-11 14:48:06 +01:00
Raul Ochoa
b1b57d6f24
Regenerate npm-shrinkwrap.json
2015-02-10 11:41:22 +01:00
Raul Ochoa
547782eea5
Use windshaft's plain-renderer-plus-http-default-plus-per-layer-datasource
...
branch to pick latest developments for medusa
2015-02-06 12:03:17 +01:00
Raul Ochoa
2c7bc6adde
Datasource to give per-layer authentication in named layers
...
Make beforeLayergroupCreate to return a datasource with different
authentication for the different layers.
- Named layers will get access to private tables in case it's needed
Changes in MapConfigNamedLayersAdapter:
- It will retrieve the dbAuth params only if named layers are present so
there is no extra overhead for normal layers
- Rename queue function signature from `callback` to `done` so it is easier
to follow the code
Add several tests to validate `named` layers authentication
2015-02-04 11:30:36 +01:00
Raul Ochoa
5573dfda84
Add queue-async dependency
2015-01-30 15:26:27 +01:00
Raul Ochoa
7a22973258
Use windshaft's before-layergroup-step branch
2015-01-30 12:59:26 +01:00
Raul Ochoa
e445d0de01
Stubs next version
2015-01-28 17:37:38 +01:00
Raul Ochoa
ee1454d91c
Stubs next version
2015-01-28 13:16:57 +01:00
Raul Ochoa
0e4e56f333
Fix version number
2015-01-28 13:14:32 +01:00
Raul Ochoa
c1d4da870f
Upgrades windshaft to 0.35.1, see https://github.com/CartoDB/Windshaft/pull/254
2015-01-28 13:09:53 +01:00
Raul Ochoa
3c26f1f986
Stubs next version
2015-01-27 17:51:04 +01:00
Raul Ochoa
30c6a390ac
Upgrades windshaft to 0.35.0, supports mapconfig version 1.3.0
2015-01-27 17:49:08 +01:00
Raul Ochoa
3a97af767f
Stubs next version
2015-01-26 17:33:22 +01:00
Raul Ochoa
57dd36a476
Release 1.25.0
2015-01-26 17:30:51 +01:00
Raul Ochoa
1d91f0fca9
Stubs next version
2015-01-15 17:37:51 +01:00
Raul Ochoa
cf004322fd
Upgrades windshaft to 0.34.0 for retina support
2015-01-15 17:21:24 +01:00
Raul Ochoa
30d8f28221
Use retina branch from windshaft
2015-01-14 18:26:28 +01:00
Raul Ochoa
f13fec13b8
Stubs next version
2015-01-14 16:42:41 +01:00
Raul Ochoa
48d44bada1
Regenerate npm-shrinkwrap.json
2015-01-14 16:18:31 +01:00
Raul Ochoa
a20d08ddc8
Stubs next version
2015-01-14 15:52:20 +01:00
Raul Ochoa
4f18e31af5
Release 1.23.0
2015-01-14 15:50:59 +01:00
Raul Ochoa
1776d31ba4
Upgrades windshaft to 0.33.0
2015-01-14 15:32:59 +01:00
Raul Ochoa
845ebcac15
Merge branch 'master' into static-controllers
...
Conflicts:
npm-shrinkwrap.json
2015-01-13 12:45:37 +01:00
Raul Ochoa
45f73d4be8
Stubs next version
2015-01-13 12:19:28 +01:00
Raul Ochoa
ebdd71f342
Release 1.22.0
2015-01-13 12:18:10 +01:00
Raul Ochoa
aad2a1e098
Regenerate npm-shrinkwrap.json
2015-01-13 12:01:34 +01:00
Alejandro Martínez
07fd7619bc
Merge remote-tracking branch 'origin/master' into health-check
...
Conflicts:
NEWS.md
npm-shrinkwrap.json
package.json
2015-01-13 11:55:54 +01:00
Raul Ochoa
180109e3aa
Update npm-shrinkwrap.json
2015-01-02 15:36:19 +01:00
Raul Ochoa
f84b907dc8
Merge branch 'master' into static-controllers
...
Conflicts:
npm-shrinkwrap.json
package.json
2014-12-16 19:05:39 +01:00
