From 6a6cd04dd4015253f7a2e46939a9c38142bfc9c0 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Date: Sat, 17 Sep 2016 02:31:33 -0400 Subject: [PATCH] Reverted the license back to MIT and updated some info in package.json. --- LICENSE | 29 +++++++++++++++++++---------- README.md | 4 ++-- package.json | 4 ++-- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 26992837..005eebbd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,22 @@ -Copyright 2016 Syncleus, Inc. +The MIT License (MIT) -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +Copyright (c) 2015 Minko Gechev +Copyright (c) 2016 Nathan Walker - http://www.apache.org/licenses/LICENSE-2.0 +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: -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +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. diff --git a/README.md b/README.md index 9325d8b5..d030fd84 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@  [](https://github.com/mgechev/angular2-style-guide) -[](https://travis-ci.org/NathanWalker/angular2-seed-advanced) +[](https://travis-ci.org/Syncleus/angular2-seed-material2-advanced) [](http://opensource.org/licenses/MIT) [](https://david-dm.org/NathanWalker/angular2-seed-advanced) [](https://david-dm.org/NathanWalker/angular2-seed-advanced#info=devDependencies) @@ -399,4 +399,4 @@ Please see the [CONTRIBUTING](https://github.com/NathanWalker/angular2-seed-adva ## License -MIT \ No newline at end of file +MIT diff --git a/package.json b/package.json index 637caf48..323ff73c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "A seed project for Angular2, material design, and all the features of the advanced seed.", "repository": { - "url": "https://github.com/Syncleus/driftlog-client" + "url": "https://github.com/Syncleus/angular2-seed-material2-advanced" }, "scripts": { "build.desktop.mac": "rimraf desktop/mac/* && gulp desktop.mac", @@ -60,7 +60,7 @@ "name": "Jeffrey Phillips Freeman <freemo@gmail.com>" } ], - "license": "Apache-2.0", + "license": "MIT", "devDependencies": { "@angular/compiler-cli": "^0.6.1", "@angular/platform-server": "2.0.0", -- GitLab