mirror of
https://github.com/chatmail/relay.git
synced 2026-05-12 00:54:37 +00:00
Compare commits
9 Commits
r10s/tweak
...
dev-note
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00fee6dbeb | ||
|
|
648b3e0ec3 | ||
|
|
2adfed2714 | ||
|
|
12542f7bed | ||
|
|
4aca88acf8 | ||
|
|
b1ac2b78c2 | ||
|
|
4a2b37f740 | ||
|
|
bb3a0a9945 | ||
|
|
3cde5be3b4 |
4
.github/CODE_OF_CONDUCT.md
vendored
Normal file
4
.github/CODE_OF_CONDUCT.md
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
Please refer to
|
||||||
|
[Delta Chat community standards and practices](https://delta.chat/en/community-standards)
|
||||||
|
which also apply for all chatmail developments.
|
||||||
21
LICENSE
Normal file
21
LICENSE
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2023, chatmail and delta chat teams
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
|
the Software without restriction, including without limitation the rights to
|
||||||
|
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||||
|
of the Software, and to permit persons to whom the Software is furnished to do
|
||||||
|
so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
@@ -30,10 +30,10 @@ def test_login_smtp(benchmark, smtp, gencreds):
|
|||||||
|
|
||||||
class TestDC:
|
class TestDC:
|
||||||
def test_autoconfigure(self, benchmark, cmfactory):
|
def test_autoconfigure(self, benchmark, cmfactory):
|
||||||
def autoconfig_and_idle_ready():
|
def dc_autoconfig_and_idle_ready():
|
||||||
cmfactory.get_online_accounts(1)
|
cmfactory.get_online_accounts(1)
|
||||||
|
|
||||||
benchmark(autoconfig_and_idle_ready, 5)
|
benchmark(dc_autoconfig_and_idle_ready, 5)
|
||||||
|
|
||||||
def test_ping_pong(self, benchmark, cmfactory):
|
def test_ping_pong(self, benchmark, cmfactory):
|
||||||
ac1, ac2 = cmfactory.get_online_accounts(2)
|
ac1, ac2 = cmfactory.get_online_accounts(2)
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ Welcome to instant, interoperable and [privacy-preserving](privacy.html) messagi
|
|||||||
|
|
||||||
💬 **Start** chatting with any Delta Chat contacts using [QR invite codes](https://delta.chat/en/help#howtoe2ee)
|
💬 **Start** chatting with any Delta Chat contacts using [QR invite codes](https://delta.chat/en/help#howtoe2ee)
|
||||||
|
|
||||||
<div class="experimental">Note: this is an experimental service</div>
|
{% if config.mail_domain != "nine.testrun.org" %}
|
||||||
|
<div class="experimental">Note: this is only a temporary development chatmail service</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|||||||
@@ -218,97 +218,16 @@ on these or possible objections.
|
|||||||
A deletion can be made
|
A deletion can be made
|
||||||
directly in the Delta Chat email messenger.
|
directly in the Delta Chat email messenger.
|
||||||
|
|
||||||
a) request information about your personal data processed by us
|
If you have any questions or complaints,
|
||||||
in accordance with Art. 15 GDPR.
|
please feel free to contact us by email:
|
||||||
In particular,
|
{{ config.privacy_mail }}
|
||||||
you can request information about the processing purposes,
|
|
||||||
the category of personal data,
|
|
||||||
the categories of recipients to whom your data have been or will be disclosed,
|
|
||||||
the planned storage period,
|
|
||||||
the existence of a right to rectification, erasure, restriction of processing or objection,
|
|
||||||
the existence of a right of complaint,
|
|
||||||
the origin of your data if it has not been collected by us,
|
|
||||||
as well as the existence of automated decision-making including profiling
|
|
||||||
and, if applicable,
|
|
||||||
meaningful information about its details;
|
|
||||||
|
|
||||||
b) in accordance with Art. 16 of the GDPR,
|
As a rule, you can contact the supervisory authority of your usual place of residence
|
||||||
immediately request the correction
|
|
||||||
of inaccurate or incomplete personal data stored by us;
|
|
||||||
|
|
||||||
c) pursuant to Article 17 of the GDPR,
|
|
||||||
to request the erasure of your personal data stored by us,
|
|
||||||
unless the processing is necessary
|
|
||||||
for the exercise of the right to freedom of expression and information,
|
|
||||||
for compliance with a legal obligation,
|
|
||||||
for reasons of public interest,
|
|
||||||
or for the establishment, exercise or defence of legal claims;
|
|
||||||
|
|
||||||
d) pursuant to Art. 18 GDPR,
|
|
||||||
to request the restriction of the processing of your personal data,
|
|
||||||
insofar as the accuracy of the data is disputed by you,
|
|
||||||
the processing is unlawful,
|
|
||||||
but you object to its erasure
|
|
||||||
and we no longer require the data,
|
|
||||||
but you need it for the assertion, exercise or defence of legal claims
|
|
||||||
or you have objected to the processing pursuant to Art. 21 GDPR;
|
|
||||||
|
|
||||||
e) pursuant to Art. 20 GDPR,
|
|
||||||
to receive your personal data that you have provided to us
|
|
||||||
in a structured, common and machine-readable format
|
|
||||||
or to request that it be transferred to another controller;
|
|
||||||
|
|
||||||
f) in accordance with Art. 7 (3) of the GDPR,
|
|
||||||
to revoke your consent given to us at any time.
|
|
||||||
This has the consequence that we may no longer continue the data processing
|
|
||||||
based on this consent in the future; and
|
|
||||||
|
|
||||||
g) complain to a supervisory authority
|
|
||||||
in accordance with Article 77 of the GDPR.
|
|
||||||
As a rule,
|
|
||||||
you can contact the supervisory authority of your usual place of residence
|
|
||||||
or workplace
|
or workplace
|
||||||
or our registered office for this purpose.
|
or our registered office for this purpose.
|
||||||
The supervisory authority responsible for our place of business
|
The supervisory authority responsible for our place of business
|
||||||
is the `{{ config.privacy_supervisor }}`.
|
is the `{{ config.privacy_supervisor }}`.
|
||||||
|
|
||||||
If you have any questions or complaints, please feel free to contact us by email:
|
|
||||||
{{ config.privacy_mail }}
|
|
||||||
|
|
||||||
|
|
||||||
### 5.1 Right to object
|
|
||||||
|
|
||||||
If your personal data is processed on the basis of our legitimate interests
|
|
||||||
in accordance with Art. 6 (1) lit. f GDPR,
|
|
||||||
you have the right to object to the processing of your personal data
|
|
||||||
in accordance with Art. 21 GDPR,
|
|
||||||
provided that there are grounds for this based on your particular situation
|
|
||||||
or the objection is directed against direct advertising.
|
|
||||||
In the latter case,
|
|
||||||
you have a general right of objection,
|
|
||||||
which will be implemented by us
|
|
||||||
without specifying a particular situation.
|
|
||||||
|
|
||||||
If you wish to exercise your right of objection,
|
|
||||||
simply send an e-mail to: {{ config.privacy_mail }}
|
|
||||||
|
|
||||||
### 5.2 Right to withdraw
|
|
||||||
|
|
||||||
If your personal data is processed on the basis of your consent
|
|
||||||
in accordance with Art. 6 (1) lit. a GDPR
|
|
||||||
(e.g. via the mailing list),
|
|
||||||
you can withdraw your consent at any time
|
|
||||||
and without any disadvantages.
|
|
||||||
As a result,
|
|
||||||
we may no longer continue the data processing
|
|
||||||
that was based on this consent for the future.
|
|
||||||
However,
|
|
||||||
the withdrawal of your consent
|
|
||||||
does not affect the lawfulness of the processing
|
|
||||||
carried out on the basis of the consent until the withdrawal.
|
|
||||||
|
|
||||||
If you wish to make use of your right of withdrawal,
|
|
||||||
simply send an e-mail to: {{ config.privacy_mail }}
|
|
||||||
|
|
||||||
## 6. Validity of this privacy policy
|
## 6. Validity of this privacy policy
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user