From 35ce87303f4d26d3ad0922e15cbd32443ec0b134 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 20 Oct 2022 14:27:16 +0100 Subject: [PATCH] Doc: Update copyright --- LICENSE | 2 +- packages/app-cli/package.json | 3 ++- packages/server/LICENSE.md | 10 +++++----- packages/server/readme/CLA.md | 2 +- packages/server/src/routes/index/privacy.ts | 2 +- packages/server/src/routes/index/terms.ts | 2 +- packages/server/src/views/partials/footer.mustache | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index 206568392..57ac405d4 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ under that directory is licensed under the default license, which is MIT. * * * -Joplin® is a trademark of Cozic Ltd registered in the European Union, with +Joplin® is a trademark of JOPLIN SAS registered in the European Union, with filing number 018544315. * * * diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index 1b9b82698..58cbede7e 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -29,7 +29,8 @@ 2018, 2019, 2020, - 2021 + 2021, + 2022 ], "owner": "Laurent Cozic" }, diff --git a/packages/server/LICENSE.md b/packages/server/LICENSE.md index 2b9da3b88..fc8846f71 100644 --- a/packages/server/LICENSE.md +++ b/packages/server/LICENSE.md @@ -3,11 +3,11 @@ v.1: 21 December 2021 This Joplin Server Personal Use License (the "**License**") is a legally binding -agreement between Cozic Ltd. registered under the laws of England and Wales -(the "**Licensor**"), the owner of the server entitled ‘Joplin Server,’ the -related software applications, and services (collectively, the "**Software**") -and an individual user accessing the Software (the "**Licensee**") (each -individually a "**Party**" and collectively, the "**Parties**"). +agreement between JOPLIN registered under the laws of France (the +"**Licensor**"), the owner of the server entitled ‘Joplin Server,’ the related +software applications, and services (collectively, the "**Software**") and an +individual user accessing the Software (the "**Licensee**") (each individually +a "**Party**" and collectively, the "**Parties**"). # 1. Acceptance of the License diff --git a/packages/server/readme/CLA.md b/packages/server/readme/CLA.md index f8cb36da2..4dc047ff9 100644 --- a/packages/server/readme/CLA.md +++ b/packages/server/readme/CLA.md @@ -1,6 +1,6 @@ # Individual Contributor License Agreement -Thank you for your interest in Joplin Server, owned by Cozic Ltd (the +Thank you for your interest in Joplin Server, owned by JOPLIN (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, diff --git a/packages/server/src/routes/index/privacy.ts b/packages/server/src/routes/index/privacy.ts index 68b32f39f..db9833435 100644 --- a/packages/server/src/routes/index/privacy.ts +++ b/packages/server/src/routes/index/privacy.ts @@ -15,7 +15,7 @@ router.get('privacy', async (_path: SubPath, _ctx: AppContext) => { ## Who are we? -The Joplin Cloud web service is owned by Cozic Ltd, registered in England and Wales. +The Joplin Cloud web service is owned by Joplin, registered in France. ## What information do we collect? diff --git a/packages/server/src/routes/index/terms.ts b/packages/server/src/routes/index/terms.ts index 6d3768453..ea07f1e8c 100644 --- a/packages/server/src/routes/index/terms.ts +++ b/packages/server/src/routes/index/terms.ts @@ -13,7 +13,7 @@ router.get('terms', async (_path: SubPath, _ctx: AppContext) => { const markdownIt = new MarkdownIt(); return markdownIt.render(`# **Joplin Cloud** usage terms and conditions -Welcome to our website. If you continue to browse and use this website, you are agreeing to comply with and be bound by the following terms and conditions of use, which together with our privacy policy govern Cozic Ltd’s relationship with you in relation to this website. Cozic Ltd is the owner of this website, Joplin Cloud. If you disagree with any part of these terms and conditions, please do not use our website. +Welcome to our website. If you continue to browse and use this website, you are agreeing to comply with and be bound by the following terms and conditions of use, which together with our privacy policy govern JOPLIN’s relationship with you in relation to this website. JOPLIN is the owner of this website, Joplin Cloud. If you disagree with any part of these terms and conditions, please do not use our website. The term ‘Joplin Cloud’ or ‘us’ or ‘we’ refers to the owner of the website whose registered office is 32 Greenfield Gardens, London, NW2 1HX. Our company registration number is 06547799. The term ‘you’ refers to the user or viewer of our website. diff --git a/packages/server/src/views/partials/footer.mustache b/packages/server/src/views/partials/footer.mustache index 2dbdf50af..5d890c315 100644 --- a/packages/server/src/views/partials/footer.mustache +++ b/packages/server/src/views/partials/footer.mustache @@ -1,5 +1,5 @@
- {{global.appName}} {{global.appVersion}}, copyright © 2021 Laurent Cozic.{{#global.termsUrl}} For more information, see the Terms of Use and Privacy Policy{{/global.termsUrl}} + {{global.appName}} {{global.appVersion}}, copyright © 2022 JOPLIN.{{#global.termsUrl}} For more information, see the Terms of Use and Privacy Policy{{/global.termsUrl}}
\ No newline at end of file