Merge branch 'v1.2' into installer-v2

This commit is contained in:
AJ ONeal 2017-11-07 04:17:34 -07:00
commit c37727e5d7
3 changed files with 46 additions and 4 deletions

4
CHANGELOG Normal file
View File

@ -0,0 +1,4 @@
v1.2.5 - Beginning of CHANGELOG
* has semi-functional launchpad
* OAuth3 with issuer-rewrite merged in
* capabilities API

42
LICENSE
View File

@ -1,3 +1,41 @@
Copyright 2017 Daplie Inc.
Copyright 2017 Daplie, Inc
All Rights Reserved
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.

View File

@ -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 <aj@daplie.com> (https://daplie.com)",
"license": "Apache2",
"license": "(MIT or Apache2)",
"bugs": {
"url": "https://github.com/Daplie/walnut/issues"
},