From 76e882c572eafb4bc5426579f744126f7d2b3f6b Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 7 Nov 2017 04:17:05 -0700 Subject: [PATCH] bump ver, add standard files --- CHANGELOG | 4 ++++ LICENSE | 42 ++++++++++++++++++++++++++++++++++++++++-- package.json | 4 ++-- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..7c30799 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,4 @@ +v1.2.5 - Beginning of CHANGELOG + * has semi-functional launchpad + * OAuth3 with issuer-rewrite merged in + * capabilities API diff --git a/LICENSE b/LICENSE index c96310a..6297ea2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,41 @@ -Copyright 2017 Daplie Inc. +Copyright 2017 Daplie, Inc -All Rights Reserved \ No newline at end of file +This is open source software; you can redistribute it and/or modify it under the +terms of either: + + a) the "MIT License" + b) the "Apache-2.0 License" + +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. + +Apache-2.0 License Summary + + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. diff --git a/package.json b/package.json index 8cfb406..5d6a44b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "walnut", - "version": "0.1.0", + "version": "1.2.5", "description": "zero-config home cloud server", "main": "walnut.js", "scripts": { @@ -34,7 +34,7 @@ "public" ], "author": "AJ ONeal (https://daplie.com)", - "license": "Apache2", + "license": "(MIT or Apache2)", "bugs": { "url": "https://github.com/Daplie/walnut/issues" },