Skip to content

Commit

Permalink
Merge pull request #386 from adamwdraper/develop
Browse files Browse the repository at this point in the history
1.5.6
  • Loading branch information
adamwdraper authored Nov 24, 2016
2 parents b50f4c9 + 8af3253 commit b598d6e
Show file tree
Hide file tree
Showing 8 changed files with 331 additions and 258 deletions.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Develop [![Build Status](https://travis-ci.org/adamwdraper/Numeral-js.svg?branch

# Contributing

#### Please submit all pull requests to the `develop` branch.
#### Important: Please create your branch from and submit pull requests to the `develop` branch.

1. Fork the library

Expand Down Expand Up @@ -47,12 +47,22 @@ See [the english unit tests](https://github.com/adamwdraper/Numeral-js/blob/mast

# Changelog

### 1.5.6

Bug fix: numeral converts strings to numbers

Bug fix: Null values return same as 0

### 1.5.5

Contained breaking changes, recommended to use 1.5.6

Bug fix: Switch bytes back to `b` and change iecBinary to `ib`, and calculate both using 1024 for backwards compatibility

### 1.5.4

Contained breaking changes, recommended to use 1.5.6

Tests: Changed all tests to use Mocha and Chai

Tests: Added browser tests for Chrome, Firefox, and IE using saucelabs
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "numeral",
"repo": "adamwdraper/Numeral-js",
"version": "1.5.5",
"version": "1.5.6",
"description": "Format and manipulate numbers.",
"keywords": [
"numeral",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "numeral",
"repo": "adamwdraper/Numeral-js",
"version": "1.5.5",
"version": "1.5.6",
"description": "Format and manipulate numbers.",
"keywords": [
"numeral",
Expand Down
4 changes: 2 additions & 2 deletions min/numeral.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit b598d6e

Please sign in to comment.