From 83db6f642851dd460e801ef56ad7fa2fedd3215c Mon Sep 17 00:00:00 2001 From: orangesurf Date: Thu, 7 Dec 2023 09:28:36 +0000 Subject: [PATCH] Update License, about page and trademark policy with new registered trademarks --- LICENSE | 23 +++++++++++-------- .../app/components/about/about.component.html | 18 ++++++++++++--- .../trademark-policy.component.html | 7 ++++-- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 9f8592854..c592881f1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -The Mempool Open Source Project -Copyright (c) 2019-2023 The Mempool Open Source Project Developers +The Mempool Open Source Project® +Copyright (c) 2019-2023 The Mempool Space K.K. and other shadowy super-coders This program is free software; you can redistribute it and/or modify it under the terms of (at your option) either: @@ -12,13 +12,18 @@ the terms of (at your option) either: Foundation, either version 3 of the License or any later version approved by a proxy statement published on . -However, this copyright license does not include an implied right or license to -use our trademarks: The Mempool Open Source Project®, mempool.space™, the -mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal -Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered -trademarks or trademarks of Mempool Space K.K in Japan, the United States, -and/or other countries. See our full Trademark Policy and Guidelines for more -details, published on . +However, this copyright license does not include an implied right or license +to use any trademarks, service marks, logos, or trade names of Mempool Space K.K. +or any other contributor to The Mempool Open Source Project. + +The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool +Liquidity™, mempool.space®, the mempool Logo®, the mempool Square logo®, the mempool +Blocks logo™, the mempool.space Vertical Logo™, and the mempool.space Horizontal logo™ +are registered trademarks or trademarks of Mempool Space K.K in Japan, the United +States, and/or other countries. + +See our full Trademark Policy and Guidelines for more details, published on +. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e3ad51116..926eb73a4 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -406,8 +406,15 @@
Copyright © 2019-2023
- The Mempool Open Source Project + Mempool Space K.K.
+ and other shadowy super-coders
+

+ The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, the mempool logo®, the mempool Square logo®, the mempool Blocks logo™, the mempool.space Vertical Logo™, and the mempool.space Horizontal logo™; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries. +

+

+ See our Trademark Policy and Guidelines for more details, published on <https://mempool.space/trademark-policy>. +

The Mempool Open Source Project is free software; you can redistribute it and/or modify it under the terms of (at your option) either:

@@ -422,11 +429,14 @@

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the full license terms for more details.

+

+ This program incorporates software and other components licensed from third parties. See the full list of Third-Party Licenses for legal notices from those projects. +

Trademark Notice

- The Mempool Open Source Project®, mempool.space™, the mempool logo®, the mempool.space logos™, the mempool square logo®, and the mempool blocks logo™ are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries. + Mempool Space K.K.™, The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, the mempool logo®, the mempool Square logo®, the mempool Blocks logo™, the mempool.space Vertical Logo™, and the mempool.space Horizontal logo™; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.

While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our Trademark Policy and Guidelines for more details, published on <https://mempool.space/trademark-policy>. @@ -434,7 +444,9 @@

- Third-party Licenses + Terms of Service + Privacy Policy + Third-party Licenses

diff --git a/frontend/src/app/components/trademark-policy/trademark-policy.component.html b/frontend/src/app/components/trademark-policy/trademark-policy.component.html index 3a3da15dd..70b9d532d 100644 --- a/frontend/src/app/components/trademark-policy/trademark-policy.component.html +++ b/frontend/src/app/components/trademark-policy/trademark-policy.component.html @@ -8,7 +8,7 @@

Trademark Policy and Guidelines

The Mempool Open Source Project ®
-
Updated: July 19, 2021
+
Updated: December 7, 2023

@@ -56,6 +56,9 @@ Mempool Space K.K. The Mempool Open Source Project + Mempool Accelerator + Mempool Enterprise + Mempool Liquidity mempool.space @@ -304,7 +307,7 @@

Also, if you are using our Marks in a way described in the sections "Uses for Which We Are Granting a License," you must include the following trademark attribution at the foot of the webpage where you have used the Mark (or, if in a book, on the credits page), on any packaging or labeling, and on advertising or marketing materials:

-

“The Mempool Space K.K.™, The Mempool Open Source Project®, mempool.space™, the mempool logo®, the mempool.space logos™, the mempool square logo®, and the mempool blocks logo™ are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries, and are used with permission. Mempool Space K.K. has no affiliation with and does not sponsor or endorse the information provided herein.”

+

"The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, the mempool logo®, the mempool Square logo®, the mempool Blocks logo™, the mempool.space Vertical Logo™, and the mempool.space Horizontal logo™; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries, and are used with permission. Mempool Space K.K. has no affiliation with and does not sponsor or endorse the information provided herein."

  • What to Do When You See Abuse