Delete MIT+CC license from Terms of Service, add AGPLv3 to About page

This commit is contained in:
wiz 2021-03-15 05:45:53 +09:00
parent 6b47895aec
commit f173b17b90
No known key found for this signature in database
GPG Key ID: A394E332255A6173
2 changed files with 36 additions and 52 deletions

View File

@ -275,6 +275,24 @@
<br><br><br>
<h3 i18n="about.contributors">Project Contributors</h3>
<div *ngIf="contributors === null">
<br>
<div class="spinner-border text-light"></div>
</div>
<ng-template ngFor let-contributor [ngForOf]="contributors">
<a [href]="'https://github.com/' + contributor.name" target="_blank">
<div class="profile_photo d-inline-block" [title]="contributor.name">
<img class="profile_img" [src]="'/api/v1/contributors/images/' + contributor.id" />
{{ contributor.name }}
</div>
</a>
</ng-template>
<br><br><br>
<h3 i18n="about.maintainers">Project Maintainers</h3>
<div class="container text-center">
@ -298,29 +316,27 @@
</div>
</div>
<br>
<code>Copyright (c) 2019-2021</code><br>
<code>The Mempool Open Source Project</code><br>
<br>
<code>This program is free software: you can redistribute it and/or modify it</code><br>
<code>under the terms of the GNU Affero General Public License as published by</code><br>
<code>the Free Software Foundation, either version 3 of the License, or (at your</code><br>
<code>option) any later version.</code><br>
<br>
<code>This program is distributed in the hope that it will be useful, but</code><br>
<code>WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY</code><br>
<code>or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public</code><br>
<code>License for more details.</code><br>
<br>
<a href="https://www.gnu.org/licenses/agpl-3.0-standalone.html">GNU Affero General Public License v3.0</a>
<br><br>
<h3 i18n="about.contributors">Project Contributors</h3>
<div *ngIf="contributors === null">
<br>
<div class="spinner-border text-light"></div>
</div>
<ng-template ngFor let-contributor [ngForOf]="contributors">
<a [href]="'https://github.com/' + contributor.name" target="_blank">
<div class="profile_photo d-inline-block" [title]="contributor.name">
<img class="profile_img" [src]="'/api/v1/contributors/images/' + contributor.id" />
{{ contributor.name }}
</div>
</a>
</ng-template>
<br><br>
<a href="/3rdpartylicenses.txt">Third Party Licenses</a>
</div>
<br><br>
<br>
<div class="text-center">
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>

View File

@ -64,39 +64,7 @@
<br>
<h4>OPEN SOURCE LICENSE</h4>
<code>Copyright &copy; 2019-2021 The Mempool Open Source Project</code>
<br><br>
<code>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, and/or sublicense copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</code>
<br><br>
<code>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</code>
<br><br>
<code>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.</code>
<br><br>
<code>Commons Clause License Condition v1.0</code>
<br><br>
<code>Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you, the right to Sell the Software.</code>
<br><br>
<code>For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Cause License Condition notice.</code>
<br><br>
<h4>THIRD PARTY LICENSES</h4>
<p>The Mempool Open Source Project contains open source software provided by third parties, and the copyright statements and licenses for these third-party components are included at the following URL: <a href="/3rdpartylicenses.txt">THIRD-PARTY LICENSES</a>.</p>
<p>EOF</p>
</div>