Skip to content

Commit ffbc2db

Browse files
sophiebitssophiebits
committed
Merge branch '15.6-dev' into 15-stable
2 parents 86d88a0 + 5634f0d commit ffbc2db

File tree

464 files changed

+1731
-2800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

464 files changed

+1731
-2800
lines changed

‎CHANGELOG.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 15.6.2 (September 25, 2017)
2+
3+
### All Packages
4+
* Switch from BSD + Patents to MIT license
5+
6+
### React DOM
7+
8+
* Fix a bug where modifying document.documentMode would trigger IE detection in other browsers, breaking change events ([@aweary](https://github.com/aweary) in [#10032](https://github.com/facebook/react/pull/10032)
9+
* CSS Columns are treated as unitless numbers ([@aweary](https://github.com/aweary) in [#10115](https://github.com/facebook/react/pull/10115)
10+
* Fix bug in QtWebKit when wrapping synthetic events in proxies ([@walrusfruitcake](https://github.com/walrusfruitcake) in [#10115](https://github.com/facebook/react/pull/10011)
11+
* Prevent event handlers from receiving extra argument (dev only) ([@aweary](https://github.com/aweary) in [#10115](https://github.com/facebook/react/pull/8363)
12+
* Fix cases where onChange would not fire with defaultChecked on radio inputs ([@jquense](https://github.com/jquense) in [#10156](https://github.com/facebook/react/pull/10156))
13+
* Add support for controlList attribute to DOM property whitelist ([@nhunzaker](https://github.com/nhunzaker) in [#9940](https://github.com/facebook/react/pull/9940))
14+
* Fix a bug where creating an element with a ref in a constructor did not throw an error in dev mode ([@iansu](https://github.com/iansu) in [#10025](https://github.com/facebook/react/pull/10025))
15+
116
## 15.6.1 (June 14, 2017)
217

318
### React DOM
@@ -1193,4 +1208,4 @@ Each of these changes will continue to work as before with a new warning until t
11931208

11941209
## 0.3.0 (May 29, 2013)
11951210

1196-
* Initial public release
1211+
* Initial public release

‎LICENSE

+16-26
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
BSD License
2-
3-
For React software
1+
MIT License
42

53
Copyright (c) 2013-present, Facebook, Inc.
6-
All rights reserved.
7-
8-
Redistribution and use in source and binary forms, with or without modification,
9-
are permitted provided that the following conditions are met:
10-
11-
* Redistributions of source code must retain the above copyright notice, this
12-
list of conditions and the following disclaimer.
134

14-
* Redistributions in binary form must reproduce the above copyright notice,
15-
this list of conditions and the following disclaimer in the documentation
16-
and/or other materials provided with the distribution.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1711

18-
* Neither the name Facebook nor the names of its contributors may be used to
19-
endorse or promote products derived from this software without specific
20-
prior written permission.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
2114

22-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
23-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
24-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
26-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
29-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎PATENTS

-33
This file was deleted.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ To help you get your feet wet and get you familiar with our contribution process
5555

5656
### License
5757

58-
React is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
58+
React is [MIT licensed](./LICENSE).
5959

6060
React documentation is [Creative Commons licensed](./LICENSE-docs).
6161

‎addons/create-react-class/LICENSE.txt

+16-26
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
BSD License
2-
3-
For React software
1+
MIT License
42

53
Copyright (c) 2013-present, Facebook, Inc.
6-
All rights reserved.
7-
8-
Redistribution and use in source and binary forms, with or without modification,
9-
are permitted provided that the following conditions are met:
10-
11-
* Redistributions of source code must retain the above copyright notice, this
12-
list of conditions and the following disclaimer.
134

14-
* Redistributions in binary form must reproduce the above copyright notice,
15-
this list of conditions and the following disclaimer in the documentation
16-
and/or other materials provided with the distribution.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1711

18-
* Neither the name Facebook nor the names of its contributors may be used to
19-
endorse or promote products derived from this software without specific
20-
prior written permission.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
2114

22-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
23-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
24-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
26-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
29-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎addons/create-react-class/PATENTS

-33
This file was deleted.

‎addons/create-react-class/factory.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2013-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2013-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*
97
*/
108

‎addons/create-react-class/index.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2013-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2013-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*
97
*/
108

‎addons/create-react-class/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
22
"name": "create-react-class",
3-
"version": "15.6.0",
3+
"version": "15.6.2",
44
"description": "Legacy API for creating React components.",
55
"main": "index.js",
6-
"license": "BSD-3-Clause",
6+
"license": "MIT",
77
"files": [
88
"LICENSE",
9-
"PATENTS",
109
"factory.js",
1110
"index.js",
1211
"create-react-class.js",

‎addons/create-react-class/test.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2013-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2013-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*
97
* @emails react-core
108
*/

‎addons/create-react-class/webpack.config.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2013-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2013-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*
97
* @emails react-core
108
*/

‎addons/postbuild.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2015-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2015-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*
97
* @emails react-core
108
*/

‎addons/react-addons-create-fragment/LICENSE

+16-26
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
BSD License
2-
3-
For React software
1+
MIT License
42

53
Copyright (c) 2013-present, Facebook, Inc.
6-
All rights reserved.
7-
8-
Redistribution and use in source and binary forms, with or without modification,
9-
are permitted provided that the following conditions are met:
10-
11-
* Redistributions of source code must retain the above copyright notice, this
12-
list of conditions and the following disclaimer.
134

14-
* Redistributions in binary form must reproduce the above copyright notice,
15-
this list of conditions and the following disclaimer in the documentation
16-
and/or other materials provided with the distribution.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1711

18-
* Neither the name Facebook nor the names of its contributors may be used to
19-
endorse or promote products derived from this software without specific
20-
prior written permission.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
2114

22-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
23-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
24-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
26-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
29-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎addons/react-addons-create-fragment/PATENTS

-33
This file was deleted.

‎addons/react-addons-create-fragment/index.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/**
2-
* Copyright 2015-present, Facebook, Inc.
3-
* All rights reserved.
2+
* Copyright (c) 2015-present, Facebook, Inc.
43
*
5-
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
86
*/
97

108
'use strict';

0 commit comments

Comments
 (0)