Skip to content

Commit

Permalink
Files changed for version 3.15.9
Browse files Browse the repository at this point in the history
  • Loading branch information
xavijam committed Feb 1, 2016
1 parent f41a64c commit a722872
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
3.15.X (dd/mm/yyyy)
3.15.9 (01/02/2016)
------
* When scrollwheel and zoom are disabled, map panning is disabled unless device is mobile.

Expand Down
12 changes: 6 additions & 6 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Create a new branch to prepare the release:

```
git flow release start 3.15.8
git flow release start 3.15.9
```

- Build CartoDB.js files, choosing the new version:
Expand All @@ -25,7 +25,7 @@ grunt release
- Update the NEWS file and commit the changes. Take into account that new CartoDB.js version will be replaced in ```API.md```, ```RELEASING.md```, ```README.md```, ```package.json```, ```cartodb.js``` and ```examples``` files.

```
git commit -am "Files changed for version 3.15.8"
git commit -am "Files changed for version 3.15.9"
```

- Release it.
Expand All @@ -36,8 +36,8 @@ grunt publish

- Check if those files have been updated in the CDN:
```
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.8/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.15.8/cartodb.js
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.9/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.15.9/cartodb.js
http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15/cartodb.js
http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js
```
Expand All @@ -46,7 +46,7 @@ http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js
- And to finish: close the release and push it.

```
git flow release finish 3.15.8
git flow release finish 3.15.9
git push --all
git push --tags
```
Expand Down Expand Up @@ -75,7 +75,7 @@ grunt
grunt publish
```

For example, if we are in 3.15.8 and we want to go back to 3.13.4
For example, if we are in 3.15.9 and we want to go back to 3.13.4

```
git checkout 3.13.4
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cartodb.js",
"themes/css/cartodb.css"
],
"version": "3.15.8",
"version": "3.15.9",
"homepage": "https://github.com/CartoDB/cartodb.js",
"authors": [
"CartoDB <support@cartodb.com>"
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial-google-driving-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@
window.onload = main;
</script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions examples/tutorial-google-driving.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div id="map"></div>

<!-- include google maps library -->
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=INSERTYOURAPIKEYHERE"></script>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js"></script>

<!-- include cartodb.js library -->
<script src="http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js"></script>
Expand Down Expand Up @@ -90,4 +90,4 @@

</script>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb.js",
"version": "3.15.8",
"version": "3.15.9",
"description": "CartoDB javascript library",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/cartodb.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var cdb = root.cdb = {};

cdb.VERSION = "3.15.8";
cdb.VERSION = "3.15.9";
cdb.DEBUG = false;

cdb.CARTOCSS_VERSIONS = {
Expand Down

0 comments on commit a722872

Please sign in to comment.