Skip to content

Commit

Permalink
v0.12.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Wojciechowski committed Jan 19, 2016
1 parent 9eadd41 commit d6af325
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.12.4 (Jan 19 2016)

#### Bugfixes

Fix elementGroups null value errors (#1933)
Fix some glyph atlas overflow cases (#1923)

## 0.12.3 (Jan 14 2016)

#### API Improvements
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ A WebGL JavaScript interactive maps library that can render [Mapbox Vector Tiles
Include the source via HTML tags:

```html
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.3/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.3/mapbox-gl.css' rel='stylesheet' />
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.css' rel='stylesheet' />
```

For more information, see the [API documentation](https://www.mapbox.com/mapbox-gl-js/api/) and [examples](https://www.mapbox.com/mapbox-gl-js/examples/).
Expand Down Expand Up @@ -83,7 +83,7 @@ To prepare a release:
* Run `git checkout master && git merge origin/mb-pages` to merge `mb-pages` into `master`
* Update `CHANGELOG.md` with all changes since the last release. A list of commits is available on the [GitHub Releases page](https://github.com/mapbox/mapbox-gl-js/releases) through a link that says "X commits to master since this release"
* Update the version number in `package.json`, `README.md`, `bench/fps/site.js`, `_config.yml`, and `_config.mb-pages.yml`
* Run `git commit -m "vX.Y.Z"` to commit changes
* Run `git commit -a -m "vX.Y.Z"` to commit changes
* Run `git tag vX.Y.Z` to tag the release
* Run `git push origin && git push origin --tags` to push the new commit and tag to GitHub
* Create a [GitHub release](https://github.com/mapbox/mapbox-gl-js/releases/new) using the tag you just pushed and the text in `CHANGELOG.md`
Expand Down
2 changes: 1 addition & 1 deletion _config.mb-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permalink: /:categories/:title
baseurl: /mapbox-gl-js
highlighter: pygments
excerpt_separator: ""
version: v0.12.3
version: v0.12.4
rdiscount:
extensions: [smart]
exclude: [dist]
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permalink: /:categories/:title
baseurl: /mapbox-gl-js
highlighter: pygments
excerpt_separator: ""
version: v0.12.3
version: v0.12.4
mapboxglbase: /mapbox-gl-js/dist
rdiscount:
extensions: [smart]
6 changes: 2 additions & 4 deletions bench/fps/site.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
var urls = [
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.3/mapbox-gl.js',
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.js',
'/dist/mapbox-gl.js',
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.3/mapbox-gl.js',
'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.js',
'/dist/mapbox-gl.js'
];

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mapbox-gl",
"description": "A WebGL interactive maps library",
"version": "0.12.3",
"version": "0.12.4",
"main": "js/mapbox-gl.js",
"license": "BSD-3-Clause",
"repository": {
Expand Down

0 comments on commit d6af325

Please sign in to comment.