From c2bc54a17aedf12967b5a147239f5b525ced8a81 Mon Sep 17 00:00:00 2001 From: 3imed-jaberi Date: Fri, 24 Jan 2020 20:53:45 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=20merge=20the=202=20MIT=20licenses=20to=20?= =?UTF-8?q?onee=20=F0=9F=93=8B=F0=9F=97=9D=20..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 ++ LICENSE.md | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE index fbf368a7..47db0c24 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,6 @@ The MIT License (MIT) + +Copyright (c) 2014-present yiminghe Copyright (c) 2015-present Alipay.com, https://www.alipay.com/ Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 1f5a0d9d..00000000 --- a/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-present yiminghe - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From e4199ba65aa49a3415758e98d09d54feaf1de260 Mon Sep 17 00:00:00 2001 From: 3imed-jaberi Date: Fri, 24 Jan 2020 20:57:01 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=20update/add=20the=20LICENSE=20path=20?= =?UTF-8?q?=F0=9F=93=91=20..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2edb2081..81af66ba 100644 --- a/README.md +++ b/README.md @@ -275,9 +275,9 @@ Whether character is entered. > (close: boolean) => void -improve shake when page scroll bar hidden +improve shake when page scroll bar hidden. -`switchScrollingEffect` change body style, and add a class `ant-scrolling-effect` when called, so if you page look abnormal, please check this +`switchScrollingEffect` change body style, and add a class `ant-scrolling-effect` when called, so if you page look abnormal, please check this; ```js import switchScrollingEffect from "./src/switchScrollingEffect"; @@ -287,4 +287,4 @@ switchScrollingEffect(); ## License -rc-util is released under the MIT license. +[MIT](/LICENSE) \ No newline at end of file From 517ef53b34dccf3c3bd7af97203e7c12ea3f35b3 Mon Sep 17 00:00:00 2001 From: 3imed-jaberi Date: Fri, 24 Jan 2020 21:00:57 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=20fix=20the=20tag=20warn.=20=F0=9F=93=8C?= =?UTF-8?q?=20..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1926252..78d3e56a 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "bugs": { "url": "http://github.com/react-component/util/issues" }, - "licenses": "MIT", + "license": "MIT", "config": { "port": 8100 },