mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Doc: Update copyright
This commit is contained in:
parent
bf92ee7c44
commit
35ce87303f
2
LICENSE
2
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.
|
filing number 018544315.
|
||||||
|
|
||||||
* * *
|
* * *
|
||||||
|
@ -29,7 +29,8 @@
|
|||||||
2018,
|
2018,
|
||||||
2019,
|
2019,
|
||||||
2020,
|
2020,
|
||||||
2021
|
2021,
|
||||||
|
2022
|
||||||
],
|
],
|
||||||
"owner": "Laurent Cozic"
|
"owner": "Laurent Cozic"
|
||||||
},
|
},
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
v.1: 21 December 2021
|
v.1: 21 December 2021
|
||||||
|
|
||||||
This Joplin Server Personal Use License (the "**License**") is a legally binding
|
This Joplin Server Personal Use License (the "**License**") is a legally binding
|
||||||
agreement between Cozic Ltd. registered under the laws of England and Wales
|
agreement between JOPLIN registered under the laws of France (the
|
||||||
(the "**Licensor**"), the owner of the server entitled ‘Joplin Server,’ the
|
"**Licensor**"), the owner of the server entitled ‘Joplin Server,’ the related
|
||||||
related software applications, and services (collectively, the "**Software**")
|
software applications, and services (collectively, the "**Software**") and an
|
||||||
and an individual user accessing the Software (the "**Licensee**") (each
|
individual user accessing the Software (the "**Licensee**") (each individually
|
||||||
individually a "**Party**" and collectively, the "**Parties**").
|
a "**Party**" and collectively, the "**Parties**").
|
||||||
|
|
||||||
# 1. Acceptance of the License
|
# 1. Acceptance of the License
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Individual Contributor License Agreement
|
# 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
|
"Company"). In order to clarify the intellectual property license granted with
|
||||||
Contributions from any person or entity, the Company must have a Contributor
|
Contributions from any person or entity, the Company must have a Contributor
|
||||||
License Agreement ("CLA") on file that has been signed by each Contributor,
|
License Agreement ("CLA") on file that has been signed by each Contributor,
|
||||||
|
@ -15,7 +15,7 @@ router.get('privacy', async (_path: SubPath, _ctx: AppContext) => {
|
|||||||
|
|
||||||
## Who are we?
|
## 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?
|
## What information do we collect?
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ router.get('terms', async (_path: SubPath, _ctx: AppContext) => {
|
|||||||
const markdownIt = new MarkdownIt();
|
const markdownIt = new MarkdownIt();
|
||||||
return markdownIt.render(`# **Joplin Cloud** usage terms and conditions
|
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.
|
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.
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div class="footer">
|
<div class="footer">
|
||||||
<div class="content has-text-centered">
|
<div class="content has-text-centered">
|
||||||
{{global.appName}} {{global.appVersion}}, copyright © 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 © 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>
|
||||||
</div>
|
</div>
|
Loading…
Reference in New Issue
Block a user