self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Doc: Update copyright

Browse Source
This commit is contained in:
Laurent Cozic 2022-10-20 14:27:16 +01:00
parent bf92ee7c44
commit 35ce87303f
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -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.
* * *

3
packages/app-cli/package.json
View File

@ -29,7 +29,8 @@
2018,
2019,
2020,
2021
2021,
2022
],
"owner": "Laurent Cozic"
},

10
packages/server/LICENSE.md
View File

@ -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

2
packages/server/readme/CLA.md
View File

@ -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,

2
packages/server/src/routes/index/privacy.ts
View File

@ -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?

2
packages/server/src/routes/index/terms.ts
View File

@ -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.

2
packages/server/src/views/partials/footer.mustache
View File

@ -1,5 +1,5 @@
<div class="footer">
<div class="content has-text-centered">
{{global.appName}} {{global.appVersion}}, copyright &copy; 2021 Laurent Cozic.{{#global.termsUrl}} For more information, see the <a href="{{global.termsUrl}}">Terms of Use</a> and <a href="{{global.privacyUrl}}">Privacy Policy</a>{{/global.termsUrl}}
{{global.appName}} {{global.appVersion}}, copyright &copy; 2022 JOPLIN.{{#global.termsUrl}} For more information, see the <a href="{{global.termsUrl}}">Terms of Use</a> and <a href="{{global.privacyUrl}}">Privacy Policy</a>{{/global.termsUrl}}
</div>
</div>