FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'develop' into feature/objectsupport · JavaScriptIOT/mathjs@15b640f · GitHub

Commit 15b640f

Browse files
committed
Merge branch 'develop' into feature/objectsupport
Conflicts: HISTORY.md
2 parents 01a7713 + 5911fe6 commit 15b640f

17 files changed

Lines changed: 11740 additions & 11542 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ node_js:
33
- 0.10
44
- 0.12
55
- 4.0
6-
- 4.1
6+
- 4.2
7+
- 5.4

‎HISTORY.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
# History
22

33

4-
## not yet released, version 2.6.0
4+
## not yet released, version 3.0.0
5+
6+
### breaking changes
7+
8+
### non-breaking changes
59

610
- Implemented support for JSON objects in the expression parser.
711
- Implemented support for JSON objects in the function `math.format`.
12+
- The command line interface does no longer round BigNumbers to 14 digits as
13+
it does with numbers.
14+
- Fixed a bug in the toString method of an IndexNode.
15+
16+
17+
## 2016-01-08, version 2.6.0
18+
819
- Implemented (complex) units `VA` and `VAR`.
920
- Implemented time units for weeks, months, years, decades, centuries, and
10-
- millennia. Thanks @owenversteeg.
21+
millennia. Thanks @owenversteeg.
1122
- Implemented new notation `engineering` in function `math.format`.
1223
Thanks @johnmarinelli.
13-
- The command line interface does no longer round BigNumbers to 14 digits as
14-
it does with numbers.
1524
- Fixed #523: In some circumstances, matrix subset returned a scalar instead
1625
of the correct subset.
17-
- Fixed a bug in the toString method of an IndexNode.
26+
- Fixed #536: A bug in an internal method used for sparse matrices.
1827

1928

2029
## 2015-12-05, version 2.5.0

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
math.js
22
https://github.com/josdejong/mathjs
33

4-
Copyright (C) 2013-2015 Jos de Jong <wjosdejong@gmail.com>
4+
Copyright (C) 2013-2016 Jos de Jong <wjosdejong@gmail.com>
55

66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ To see the coverage results, open the generated report in your browser:
110110

111111
## License
112112

113-
Copyright (C) 2013-2015 Jos de Jong <wjosdejong@gmail.com>
113+
Copyright (C) 2013-2016 Jos de Jong <wjosdejong@gmail.com>
114114

115115
Licensed under the Apache License, Version 2.0 (the "License");
116116
you may not use this file except in compliance with the License.

‎bin/cli.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* cat script.txt | mathjs > results.txt Run input stream, output to file
3030
*
3131
* @license
32-
* Copyright (C) 2013-2015 Jos de Jong <wjosdejong@gmail.com>
32+
* Copyright (C) 2013-2016 Jos de Jong <wjosdejong@gmail.com>
3333
*
3434
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
3535
* use this file except in compliance with the License. You may obtain a copy

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mathjs",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"main": "./dist/math.min.js",
55
"license": "Apache-2.0",
66
"ignore": [

‎component.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mathjs",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"description": "Math.js is an extensive math library for JavaScript and Node.js. It features a flexible expression parser and offers an integrated solution to work with numbers, big numbers, complex numbers, units, and matrices.",
55
"repo": "josdejong/mathjs",
66
"main": "dist/math.min.js",

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL