From a0d0650e2a1bebc5c3f8199cdc65ad891a9fca97 Mon Sep 17 00:00:00 2001 From: orangesurf Date: Wed, 3 Jan 2024 19:09:59 +0100 Subject: [PATCH 1/7] update trademarks --- .../src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts | 2 +- frontend/src/app/components/about/about.component.html | 2 +- .../trademark-policy/trademark-policy.component.html | 2 +- frontend/src/app/services/seo.service.ts | 2 +- .../components/global-footer/global-footer.component.html | 4 ++-- frontend/src/index.bisq.html | 6 +++--- frontend/src/index.liquid.html | 6 +++--- unfurler/src/index.ts | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts index 92ad9b744..76c161046 100644 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts +++ b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts @@ -30,7 +30,7 @@ export class BisqDashboardComponent implements OnInit { ngOnInit(): void { this.seoService.setTitle($localize`:@@meta.title.bisq.markets:Markets`); - this.seoService.setDescription($localize`:@@meta.description.bisq.markets:Explore the full Bitcoin ecosystem with The Mempool Open Source Project™. See Bisq market prices, trading activity, and more.`); + this.seoService.setDescription($localize`:@@meta.description.bisq.markets:Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See Bisq market prices, trading activity, and more.`); this.websocketService.want(['blocks']); this.volumes$ = this.bisqApiService.getAllVolumesDay$() diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index dd2a4ead2..a66dc4944 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -422,7 +422,7 @@ Trademark Notice

- The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem™, Mempool Goggles™, the mempool logo, the mempool Square logo, the mempool Blocks logo, the mempool Blocks 3 | 2 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. + The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem®, Mempool Goggles™, the mempool logo, the mempool Square logo, the mempool Blocks logo, the mempool Blocks 3 | 2 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>. 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 b60e10f7b..54212ebd4 100644 --- a/frontend/src/app/components/trademark-policy/trademark-policy.component.html +++ b/frontend/src/app/components/trademark-policy/trademark-policy.component.html @@ -315,7 +315,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 Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem™, Mempool Goggles™, the mempool logo;, the mempool Square logo;, the mempool Blocks logo;, the mempool Blocks 3 | 2 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."

+

"The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, Mempool Liquidity™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem®, Mempool Goggles™, the mempool logo;, the mempool Square logo;, the mempool Blocks logo;, the mempool Blocks 3 | 2 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

    • diff --git a/frontend/src/app/services/seo.service.ts b/frontend/src/app/services/seo.service.ts index 0c4aa405a..531a795dc 100644 --- a/frontend/src/app/services/seo.service.ts +++ b/frontend/src/app/services/seo.service.ts @@ -10,7 +10,7 @@ import { StateService } from './state.service'; export class SeoService { network = ''; baseTitle = 'mempool'; - baseDescription = 'Explore the full Bitcoin ecosystem with The Mempool Open Source Project™.'; + baseDescription = 'Explore the full Bitcoin ecosystem® with The Mempool Open Source Project®.'; canonicalLink: HTMLElement = document.getElementById('canonical'); diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index fba04e605..1fe3ec838 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -9,7 +9,7 @@

    Explore the full Bitcoin ecosystem - ™ + ®

    @@ -32,7 +32,7 @@

    Explore the full Bitcoin ecosystem - ™ + ®

    diff --git a/frontend/src/index.bisq.html b/frontend/src/index.bisq.html index cb733cb41..06c903ea2 100644 --- a/frontend/src/index.bisq.html +++ b/frontend/src/index.bisq.html @@ -7,16 +7,16 @@ - + - + - + diff --git a/frontend/src/index.liquid.html b/frontend/src/index.liquid.html index 2029e5083..d2810d6e6 100644 --- a/frontend/src/index.liquid.html +++ b/frontend/src/index.liquid.html @@ -7,17 +7,17 @@ - + - + - + diff --git a/unfurler/src/index.ts b/unfurler/src/index.ts index 3c7d3cc92..166b86158 100644 --- a/unfurler/src/index.ts +++ b/unfurler/src/index.ts @@ -343,7 +343,7 @@ class Server { ${ogTitle} - + From bc5e03deb55dc69e887fa32fa64991b0ff27f922 Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Sun, 21 Jan 2024 11:13:55 +0000 Subject: [PATCH 2/7] Update index.bisq.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from ® to ® for better compatibility --- frontend/src/index.bisq.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/index.bisq.html b/frontend/src/index.bisq.html index 06c903ea2..48ee7301b 100644 --- a/frontend/src/index.bisq.html +++ b/frontend/src/index.bisq.html @@ -7,16 +7,16 @@ - + - + - + From aaf378ed42019963f76518f2ae2283221c266e27 Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Sun, 21 Jan 2024 11:15:11 +0000 Subject: [PATCH 3/7] Update index.liquid.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from ® to ® for better compatibility --- frontend/src/index.liquid.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/index.liquid.html b/frontend/src/index.liquid.html index d2810d6e6..5aa14cd2d 100644 --- a/frontend/src/index.liquid.html +++ b/frontend/src/index.liquid.html @@ -7,17 +7,17 @@ - + - + - + From 2750f1789c077b48023815333a78531811b1f564 Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Sun, 21 Jan 2024 11:17:50 +0000 Subject: [PATCH 4/7] Update index.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from ® to ® for better compatibility --- unfurler/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unfurler/src/index.ts b/unfurler/src/index.ts index 166b86158..aaa72b163 100644 --- a/unfurler/src/index.ts +++ b/unfurler/src/index.ts @@ -343,7 +343,7 @@ class Server { ${ogTitle} - + From c751e10da8121d10b5be7d6fa25d91f5d879aaa3 Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Sun, 21 Jan 2024 11:19:01 +0000 Subject: [PATCH 5/7] Update seo.service.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from ® to ® for better compatibility --- frontend/src/app/services/seo.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/services/seo.service.ts b/frontend/src/app/services/seo.service.ts index 531a795dc..7830690ff 100644 --- a/frontend/src/app/services/seo.service.ts +++ b/frontend/src/app/services/seo.service.ts @@ -10,7 +10,7 @@ import { StateService } from './state.service'; export class SeoService { network = ''; baseTitle = 'mempool'; - baseDescription = 'Explore the full Bitcoin ecosystem® with The Mempool Open Source Project®.'; + baseDescription = 'Explore the full Bitcoin ecosystem® with The Mempool Open Source Project®.'; canonicalLink: HTMLElement = document.getElementById('canonical'); From a89af41c48155dc7730cc78331517af1954249da Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Sun, 21 Jan 2024 11:20:11 +0000 Subject: [PATCH 6/7] Update bisq-dashboard.component.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from ® to ® for better compatibility --- .../src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts index 76c161046..8834d09e9 100644 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts +++ b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts @@ -30,7 +30,7 @@ export class BisqDashboardComponent implements OnInit { ngOnInit(): void { this.seoService.setTitle($localize`:@@meta.title.bisq.markets:Markets`); - this.seoService.setDescription($localize`:@@meta.description.bisq.markets:Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See Bisq market prices, trading activity, and more.`); + this.seoService.setDescription($localize`:@@meta.description.bisq.markets:Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See Bisq market prices, trading activity, and more.`); this.websocketService.want(['blocks']); this.volumes$ = this.bisqApiService.getAllVolumesDay$() From 885331fe4aa78bf3d217892d96e50658fa659fe9 Mon Sep 17 00:00:00 2001 From: orangesurf <91332210+orangesurf@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:34:43 +0000 Subject: [PATCH 7/7] Remove space from footer --- .../components/global-footer/global-footer.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index 9eb1ea876..7080c29ac 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -9,7 +9,7 @@

    Explore the full Bitcoin ecosystem - ® + ®

    @@ -32,7 +32,7 @@

    Explore the full Bitcoin ecosystem - ® + ®