forked from winjs/winstrap
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update license and bump bower and npm versions
- Loading branch information
Showing
3 changed files
with
67 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,12 @@ | ||
| ------------------------------------------- START OF THIRD PARTY NOTICE ----------------------------------------- | ||
| Copyright © 2015 Microsoft Corporation | ||
|
|
||
| This file is based on or incorporates material from the projects listed below (Third Party IP). The original copyright notice and the license under which Microsoft received such Third Party IP, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft licenses the Third Party IP to you under the licensing terms for the Microsoft Open Source project. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise. | ||
| 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. | ||
|
|
||
| Winstrap | ||
| This project incorporates material from the projects listed below (Third Party IP). The original copyright notice and the license under which Microsoft received such Third Party IP, are set forth below. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise. | ||
|
|
||
| Bootstrap | ||
| Copyright (c) 2011-2015 Twitter, Inc | ||
|
|
||
| Provided for Informational Purposes Only | ||
| MIT License | ||
| 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. | ||
| MIT License | ||
|
|
||
| ----------------------------------------------- END OF THIRD PARTY NOTICE ------------------------------------------ | ||
| 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| { | ||
| "name": "Winstrap", | ||
| "version": "0.4.1", | ||
| "homepage": "https://github.com/winjs/winstrap", | ||
| "authors": "", | ||
| "description": "Bootstrap Theme for Microsoft Modern design language", | ||
| "license": "MIT", | ||
| "dependencies": { | ||
| "bootstrap-sass": "3.3.4", | ||
| "jquery": "2.1.4" | ||
| } | ||
| "name": "Winstrap", | ||
| "version": "0.4.2", | ||
| "homepage": "https://github.com/winjs/winstrap", | ||
| "authors": "", | ||
| "description": "Bootstrap Theme for Microsoft Modern design language", | ||
| "license": "MIT", | ||
| "dependencies": { | ||
| "bootstrap-sass": "3.3.4", | ||
| "jquery": "2.1.4" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,56 @@ | ||
| { | ||
| "name": "Winstrap", | ||
| "description": "Winstrap is the official Bootstrap theme for Microsoft Modern design language.", | ||
| "repository": "https://github.com/winjs/winstrap.git", | ||
| "version": "0.4.1", | ||
| "author": { | ||
| "name": "Microsoft" | ||
| }, | ||
| "contributors": [ | ||
| { | ||
| "name": "Frederic Perrin" | ||
| "name": "Winstrap", | ||
| "description": "Winstrap is the official Bootstrap theme for Microsoft Modern design language.", | ||
| "repository": "https://github.com/winjs/winstrap.git", | ||
| "version": "0.4.2", | ||
| "author": { | ||
| "name": "Microsoft" | ||
| }, | ||
| { | ||
| "name": "Mathias Wendlinger" | ||
| "contributors": [ | ||
| { | ||
| "name": "Frederic Perrin" | ||
| }, | ||
| { | ||
| "name": "Mathias Wendlinger" | ||
| }, | ||
| { | ||
| "name": "Romain Hottlet" | ||
| }, | ||
| { | ||
| "name": "Andy Seres" | ||
| }, | ||
| { | ||
| "name": "Rachel Nizhnikova" | ||
| }, | ||
| { | ||
| "name": "Miles Grover" | ||
| }, | ||
| { | ||
| "name": "Joe Day" | ||
| }, | ||
| { | ||
| "name": "Martin Lijanto" | ||
| } | ||
| ], | ||
| "homepage": "", | ||
| "dependencies": { | ||
| "bower": "" | ||
| }, | ||
| { | ||
| "name": "Romain Hottlet" | ||
| "devDependencies": { | ||
| "assemble": "^0.4.42", | ||
| "grunt": "^0.4.5", | ||
| "grunt-bump": "^0.3.1", | ||
| "grunt-contrib-clean": "^0.6.0", | ||
| "grunt-contrib-connect": "^0.9.0", | ||
| "grunt-contrib-copy": "^0.7.0", | ||
| "grunt-contrib-jshint": "^0.11.2", | ||
| "grunt-contrib-watch": "^0.6.1", | ||
| "grunt-file-exists": "^0.1.2", | ||
| "grunt-notify": "^0.4.1", | ||
| "grunt-sass": "^0.18.0", | ||
| "jshint-stylish": "^2.0.0" | ||
| }, | ||
| { | ||
| "name": "Andy Seres" | ||
| }, | ||
| { | ||
| "name": "Rachel Nizhnikova" | ||
| }, | ||
| { | ||
| "name": "David Evans" | ||
| "scripts": { | ||
| "postinstall": "node_modules/.bin/bower install" | ||
| } | ||
| ], | ||
| "homepage": "", | ||
| "dependencies": { | ||
| "bower": "" | ||
| }, | ||
| "devDependencies": { | ||
| "assemble": "^0.4.42", | ||
| "grunt": "^0.4.5", | ||
| "grunt-bump": "^0.3.1", | ||
| "grunt-contrib-clean": "^0.6.0", | ||
| "grunt-contrib-connect": "^0.9.0", | ||
| "grunt-contrib-copy": "^0.7.0", | ||
| "grunt-contrib-jshint": "^0.11.2", | ||
| "grunt-contrib-watch": "^0.6.1", | ||
| "grunt-file-exists": "^0.1.2", | ||
| "grunt-notify": "^0.4.1", | ||
| "grunt-sass": "^0.18.0", | ||
| "jshint-stylish": "^2.0.0" | ||
| }, | ||
| "scripts": { | ||
| "postinstall": "node_modules/.bin/bower install" | ||
| } | ||
| } |