Update license (#2489)

* update license

* Update package.json license per npm docs

Co-Authored-By: tmlayton <tim.layton@shopify.com>
This commit is contained in:
Tim Layton
2018-10-24 13:27:33 -07:00
committed by GitHub
parent d3b05b5a1a
commit a3c2898ac4
4 changed files with 16 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
Copyright (c) 2017-present Shopify
Copyright (c) 2017-present Shopify Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -10,6 +10,14 @@ 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 rights granted above may only be exercised to develop and distribute
applications that integrate or interoperate with Shopify software or services,
and in the case of external, stand-alone applications that do not embed
directly inside Shopify, the rights granted above may only be exercised to
develop and distribute applications that are dissimilar and visually distinct
from Shopify products and services (including the internal administration page
of a Shopify merchant store), as determined by Shopify in its sole discretion.
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

View File

@@ -156,5 +156,5 @@ Pull requests are welcome. See the [contribution guidelines](https://github.com/
## Licenses
- Source code is licensed under [MIT](https://opensource.org/licenses/MIT)
- All icons and images are licensed under [Creative Commons Attribution-NoDerivatives 4.0](http://creativecommons.org/licenses/by-nd/4.0/)
- Source code is under a [custom license](https://github.com/Shopify/polaris-react/blob/master/LICENSE.md) based on MIT. The license restricts Polaris usage to applications that integrate or interoperate with Shopify software or services, with additional restrictions for external, stand-alone applications.
- All icons and images are licensed under the [Polaris Design Guidelines License Agreement](https://polaris.shopify.com/legal/license)

View File

@@ -78,6 +78,10 @@ The autocomplete component is an input field that provides selectable suggestion
- Added new `resourceType`, `initialQuery`, and `showVariants` props to `ResourcePicker` which aligns with the Shopify App Bridge API
- Added Shopify App Bridge support to new components `Toast` and `Loading`
#### License
- Updated the license from MIT to a custom license based on MIT. The new license restricts Polaris usage to applications that integrate or interoperate with Shopify software or services, with additional restrictions for external, stand-alone applications.
### Documentation
- Updated banner guidelines to make it clearer when success banners should be used vs success toasts. ([#2046](https://github.com/Shopify/polaris-react/pull/2046))

View File

@@ -3,7 +3,7 @@
"description": "Shopifys product component library",
"version": "3.0.0-rc.3",
"private": false,
"license": "MIT",
"license": "SEE LICENSE IN LICENSE.md",
"author": "Shopify <dev@shopify.com>",
"homepage": "https://github.com/Shopify/polaris-react#readme",
"repository": "https://github.com/Shopify/polaris-react",