Commit graph

52 commits

Author SHA1 Message Date
meaz 7c442f12a8 Remove framadate and ethercalc (#38)
To be merged on the 1st of March

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #38
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-03-01 21:38:03 +00:00
Rainer Bielefeld a86cf64ba2 German Translation for PP. Additionally I Changed 2 nabe-Tags for "Audio" and "CryptPad", which wrongly were "git". These changes also in .fr and .en (#36)
Seems that there are no objections, so: pull-request!

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: shadowsword <shadowsword@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #36
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
2022-01-31 19:13:52 +00:00
meaz a350e70eac Merge pull request 'Add a changelog' (#34) from changelog into master
Reviewed-on: #34
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-06-11 12:05:59 +00:00
meaz 2f6dcfae76
add link to changelog 2021-05-02 09:52:19 +02:00
meaz 5662c14e30
add changelog 2021-05-02 09:52:15 +02:00
meaz 572ed561e3 Merge pull request 'French translation of PS' (#32) from French into master
Reviewed-on: #32
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-12-05 23:28:00 +00:00
meaz 188e0a37e6 French translation of PS 2020-04-14 09:20:13 +02:00
meaz e17fd2057e Merge pull request 'List Fixed' (#31) from Fix-List into master
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-03-30 09:27:15 +00:00
Fede.- 525bbc72cc List Fixed
Fixed wrong list numbers
2020-03-29 02:32:56 +00:00
Fede.- f9ca03bce8 Merge pull request 'add info about cryptpad and mumble' (#30) from new_services into master
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-03-29 02:29:23 +00:00
meaz 821a328def add info about cryptpad and mumble 2020-03-28 11:26:47 +01:00
meaz ac3756f89a Merge pull request 'Privacy_Statement_Draft' (#26) from Privacy_Statement_Draft into master
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-03-11 13:50:13 +00:00
meaz c0ddc4e115 udpate the last update date 2020-03-11 14:19:54 +01:00
antil0pa 3df7973825 removed title 2020-03-11 11:59:08 +01:00
antil0pa 56a05d3c60 adjusted page naming so it is can be cloned to website 2020-03-11 11:33:17 +01:00
Fede.- 61d2412c6f Removed Diaspora* from federated services examples 2020-03-11 02:48:14 +00:00
Muppeth c3023d75f9 added PS version 2020-03-10 23:44:30 +01:00
Muppeth d763739e48 changed xmpp retention to 1month; removed diaspora. 2020-03-10 23:03:42 +01:00
Fede.- 76ada2843c Merge branch 'adjustment2' of Disroot/Disroot-Privacy-Policy into Privacy_Statement_Draft 2020-03-04 19:52:21 +00:00
meaz a70b206157 adjustment for better viewing in website repo 2020-03-01 19:06:37 +01:00
Fede.- 3d2da8cfc5 Removing all non-style code
All internal links code were removed
2020-02-18 01:36:31 +00:00
Fede.- 86edd01a33 Minor fixes on general text 2020-02-12 00:47:51 -03:00
Fede.- 31d613460b Update on "About this Document" text 2020-02-11 20:24:13 +00:00
Fede.- db0f4040fe "About this document" text fix 2020-02-10 19:37:34 -03:00
Fede.- 8a7996a3f8 Fixed some missing lines of the "About this document" text 2020-02-10 15:20:07 -03:00
Fede.- aacd7505c2 - Added notice about translations
- Modified the Changes section text
2020-02-10 15:16:32 -03:00
Fede.- 954ddf03d0 Fixed last update date 2020-02-09 19:15:32 +00:00
Fede.- 794c86eb3e Added link to changes' history. 2020-02-09 16:10:57 -03:00
Fede.- f4d6903f4b Update on Privacy Statement Draft 2020-02-05 12:50:54 -03:00
Fede.- 9fff29ad04 Outdated PP 2020-02-01 03:14:58 +00:00
Fede.- 01bd12737a Privacy Statement draft updated 2020-02-01 00:05:09 -03:00
Fede.- 7a4e3f17ea Added calc and pads modifications to Pads privacy notes 2019-11-13 19:43:38 +00:00
Fede.- d5e0c04f63 Actualizar 'pp_draft.md' 2019-11-13 18:49:54 +00:00
Fede.- b84f9b8003 PP text updated 2019-11-13 18:49:02 +00:00
Fede.- 018ca5195c Added Administrative data collection info 2019-11-13 18:46:10 +00:00
Fede.- 4ba9bf3e5e Actualizar 'pp_draft.md' 2019-11-04 19:42:40 +00:00
Fede.- ab70c631c4 Added "Changes on this PP"
Text needs revision
2019-11-02 19:04:13 +00:00
Fede.- 0e787fc6af Actualizar 'pp_draft.md' 2019-10-30 13:05:33 +00:00
Fede.- d86dd9bacf Actualizar 'pp_draft.md' 2019-10-29 19:05:14 +00:00
Fede.- 1c92c42012 Fixes on PP coverage + What data do we collect + Services names + Chat information + PP Disroot email added 2019-10-29 15:59:00 -03:00
Fede.- 5c5babf9a1 Actualizar 'pp_draft.md' 2019-10-27 15:06:14 +00:00
Fede.- ed007f7024 Privacy Policy complete draft 2019-10-27 10:26:10 -03:00
Fede.- 1df59a03c8 Merge branch '7.1.Access_to_information' of Disroot/Disroot-Privacy-Policy into master 2019-10-25 20:08:02 +00:00
Fede.- 1df7116dc9 Info added 2019-10-24 15:57:40 -03:00
Fede.- 9e734db177 Merge branch '1.What_it_covers' of Disroot/Disroot-Privacy-Policy into master 2019-10-24 18:01:17 +00:00
Fede.- a177515b8e Actualizar 'privacy_policy.md' 2019-10-15 22:43:37 +00:00
Fede.- d7af2b8b86 Actualizar 'privacy_policy.md' 2019-10-14 18:32:31 +00:00
Fede.- a531d07bc4 Scope and definitions
The data definition of the GDPR is tremendously broad.  The list of types of personal data that could lead to the identification of a natural person in the digital context further include email addresses, cookies, IP addresses and, overall, lots of online identifiers. It has to be adjusted to the context of Disroot.
2019-10-13 15:22:07 +00:00
Fede.- b24094412c What the PP covers
Define the scope of the PP
2019-10-12 17:37:38 +00:00
Fede.- 092fc37794 What the PP covers
Define the scope of the PP
2019-10-12 17:36:39 +00:00