cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mapconfig-extension

Browse Source 
Conflicts:
	npm-shrinkwrap.json
	package.json
This commit is contained in:
Raul Ochoa
2015-11-12 11:38:42 +01:00
parent 7d230cc15d 9e00cb3309
commit 86abc392a1
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS.md
+5 -2
View File
@@ -1,9 +1,12 @@
# Changelog
## 2.18.1
## 2.19.1
Released 2015-mm-dd
## 2.19.0
Released 2015-11-12
- Upgrades windshaft to [1.6.0](https://github.com/CartoDB/Windshaft/releases/tag/1.6.0)
## 2.18.0
README.md
+3 -3
View File
@@ -17,10 +17,10 @@ Requirements
------------
- Core
- Node.js >=0.8
- npm >=1.2.1
- npm >=1.2.1 <2.0.0
- PostgreSQL >8.3.x, PostGIS >1.5.x
- Redis >2.4.0 (http://www.redis.io)
- Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See Installing Mapnik.
- Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik).
- Windshaft: check [Windshaft dependencies and installation notes](https://github.com/CartoDB/Windshaft#dependencies)
- libcairo2-dev, libpango1.0-dev, libjpeg8-dev and libgif-dev for server side canvas support
@@ -92,7 +92,7 @@ Examples
--------
[CartoDB's Map Gallery](http://cartodb.com/gallery/) showcases several examples of visualisations built on top of this.
m
Contributing
---
npm-shrinkwrap.json
Generated
+18 -19
View File
@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.18.1",
"version": "2.19.1",
"dependencies": {
"body-parser": {
"version": "1.14.1",
@@ -75,7 +75,7 @@
},
"type-is": {
"version": "1.6.9",
"from": "type-is@~1.6.9",
"from": "type-is@~1.6.6",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz",
"dependencies": {
"media-typer": {
@@ -342,7 +342,7 @@
"dependencies": {
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@@ -441,7 +441,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
@@ -533,7 +533,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"isarray": {
@@ -594,7 +594,7 @@
},
"mime-types": {
"version": "2.1.7",
"from": "mime-types@~2.1.6",
"from": "mime-types@~2.1.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
"dependencies": {
"mime-db": {
@@ -605,9 +605,9 @@
}
},
"node-uuid": {
"version": "1.4.3",
"version": "1.4.4",
"from": "node-uuid@~1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.4.tgz"
},
"qs": {
"version": "5.1.0",
@@ -652,9 +652,9 @@
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
},
"hawk": {
"version": "3.1.0",
"version": "3.1.1",
"from": "hawk@~3.1.0",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz",
"dependencies": {
"hoek": {
"version": "2.16.3",
@@ -774,9 +774,9 @@
}
},
"is-my-json-valid": {
"version": "2.12.2",
"version": "2.12.3",
"from": "is-my-json-valid@^2.12.0",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
"dependencies": {
"generate-function": {
"version": "2.0.0",
@@ -801,9 +801,9 @@
"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
},
"xtend": {
"version": "4.0.0",
"version": "4.0.1",
"from": "xtend@^4.0.0",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
}
}
}
@@ -1297,9 +1297,9 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"node-uuid": {
"version": "1.4.3",
"version": "1.4.4",
"from": "node-uuid@~1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.4.tgz"
},
"tough-cookie": {
"version": "2.2.0",
@@ -3105,9 +3105,8 @@
}
},
"torque.js": {
"version": "2.11.0",
"from": "torque.js@~2.11.0",
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz"
"version": "2.11.4",
"from": "torque.js@~2.11.0"
},
"abaculus": {
"version": "1.1.0-cdb3",
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.18.1",
"version": "2.19.1",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"