Upgrade React to 0.13.3
skip-ci closes CNVS-24203 Test Plan: - Make sure all tests pass - Make sure all react areas in canvas work properly Change-Id: If989f091ae6e45f0c47081464c739344822d2e4a Reviewed-on: https://gerrit.instructure.com/59913 Product-Review: Clay Diffrient <cdiffrient@instructure.com> QA-Review: Clay Diffrient <cdiffrient@instructure.com> Tested-by: Clay Diffrient <cdiffrient@instructure.com> Reviewed-by: Dan Minkevitch <dan@instructure.com>
This commit is contained in:
parent
1599fac783
commit
6cc74d3efc
|
@ -19,7 +19,7 @@
|
|||
"ic-droppable": "~0.1.0",
|
||||
"ic-sortable": "0.0.2",
|
||||
"jquery.smartbanner": "https://github.com/jasny/jquery.smartbanner.git#8b3810210256ea2760012e18083c43792c2a4146",
|
||||
"react": "0.12.2",
|
||||
"react": "0.13.3",
|
||||
"react-router": "0.11.6",
|
||||
"react-modal": "0.1.1",
|
||||
"tinymce": "4.1.9",
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{
|
||||
"name": "react",
|
||||
"version": "0.12.2",
|
||||
"version": "0.13.3",
|
||||
"main": "react.js",
|
||||
"ignore": [],
|
||||
"homepage": "https://github.com/facebook/react-bower",
|
||||
"_release": "0.12.2",
|
||||
"_release": "0.13.3",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v0.12.2",
|
||||
"commit": "364caf9482cb2abac26763f8d7f53ef532c0658b"
|
||||
"tag": "v0.13.3",
|
||||
"commit": "f68289bbb050e7ede4a3de6dac528647a6b6489a"
|
||||
},
|
||||
"_source": "git://github.com/facebook/react-bower.git",
|
||||
"_target": "0.12.2",
|
||||
"_target": "0.13.3",
|
||||
"_originalSource": "react"
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -1,23 +1,33 @@
|
|||
Additional Grant of Patent Rights
|
||||
Additional Grant of Patent Rights Version 2
|
||||
|
||||
"Software" means the react-bower software distributed by Facebook, Inc.
|
||||
|
||||
Facebook hereby grants you a perpetual, worldwide, royalty-free, non-exclusive,
|
||||
irrevocable (subject to the termination provision below) license under any
|
||||
rights in any patent claims owned by Facebook, to make, have made, use, sell,
|
||||
offer to sell, import, and otherwise transfer the Software. For avoidance of
|
||||
doubt, no license is granted under Facebook’s rights in any patent claims that
|
||||
are infringed by (i) modifications to the Software made by you or a third party,
|
||||
or (ii) the Software in combination with any software or other technology
|
||||
provided by you or a third party.
|
||||
Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
|
||||
("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
|
||||
(subject to the termination provision below) license under any Necessary
|
||||
Claims, to make, have made, use, sell, offer to sell, import, and otherwise
|
||||
transfer the Software. For avoidance of doubt, no license is granted under
|
||||
Facebook's rights in any patent claims that are infringed by (i) modifications
|
||||
to the Software made by you or any third party or (ii) the Software in
|
||||
combination with any software or other technology.
|
||||
|
||||
The license granted hereunder will terminate, automatically and without notice,
|
||||
for anyone that makes any claim (including by filing any lawsuit, assertion or
|
||||
other action) alleging (a) direct, indirect, or contributory infringement or
|
||||
inducement to infringe any patent: (i) by Facebook or any of its subsidiaries or
|
||||
affiliates, whether or not such claim is related to the Software, (ii) by any
|
||||
party if such claim arises in whole or in part from any software, product or
|
||||
service of Facebook or any of its subsidiaries or affiliates, whether or not
|
||||
such claim is related to the Software, or (iii) by any party relating to the
|
||||
Software; or (b) that any right in any patent claim of Facebook is invalid or
|
||||
unenforceable.
|
||||
if you (or any of your subsidiaries, corporate affiliates or agents) initiate
|
||||
directly or indirectly, or take a direct financial interest in, any Patent
|
||||
Assertion: (i) against Facebook or any of its subsidiaries or corporate
|
||||
affiliates, (ii) against any party if such Patent Assertion arises in whole or
|
||||
in part from any software, technology, product or service of Facebook or any of
|
||||
its subsidiaries or corporate affiliates, or (iii) against any party relating
|
||||
to the Software. Notwithstanding the foregoing, if Facebook or any of its
|
||||
subsidiaries or corporate affiliates files a lawsuit alleging patent
|
||||
infringement against you in the first instance, and you respond by filing a
|
||||
patent infringement counterclaim in that lawsuit against that party that is
|
||||
unrelated to the Software, the license granted hereunder will not terminate
|
||||
under section (i) of this paragraph due to such counterclaim.
|
||||
|
||||
A "Necessary Claim" is a claim of a patent owned by Facebook that is
|
||||
necessarily infringed by the Software standing alone.
|
||||
|
||||
A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
|
||||
or contributory infringement or inducement to infringe any patent, including a
|
||||
cross-claim or counterclaim.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "react",
|
||||
"version": "0.12.2",
|
||||
"version": "0.13.3",
|
||||
"main": "react.js",
|
||||
"ignore": []
|
||||
}
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue