Commit Graph

54 Commits (fe7e544dc23de564a5b1f08d6f0fcf7318ae157f)
 

Author SHA1 Message Date
muppeth fe7e544dc2 changed xmpp file retention period (#42)
While introducing larger file limit for xmpp file uploads (512MB) we have also decided to change the time files are stored on the server by matching it with chat history (1month).

Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #42
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: muppeth <muppeth@no-reply@disroot.org>
Co-committed-by: muppeth <muppeth@no-reply@disroot.org>
8 months ago
meaz 3d68c6fa0c add information about the fact that pads can not be deleted by users (#41)
See issue [here](Disroot/Disroot-Project#223)

@avg_joe could you do the German translation?

Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: #41
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
9 months ago
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>
1 year ago
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>
1 year ago
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>
2 years ago
meaz 2f6dcfae76
add link to changelog 2 years ago
meaz 5662c14e30
add changelog 2 years ago
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>
3 years ago
meaz 188e0a37e6 French translation of PS 3 years ago
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>
3 years ago
Fede.- 525bbc72cc List Fixed
Fixed wrong list numbers
3 years ago
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>
3 years ago
meaz 821a328def add info about cryptpad and mumble 3 years ago
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>
3 years ago
meaz c0ddc4e115 udpate the last update date 3 years ago
antil0pa 3df7973825 removed title 3 years ago
antil0pa 56a05d3c60 adjusted page naming so it is can be cloned to website 3 years ago
Fede.- 61d2412c6f Removed Diaspora* from federated services examples 3 years ago
Muppeth c3023d75f9 added PS version 3 years ago
Muppeth d763739e48 changed xmpp retention to 1month; removed diaspora. 3 years ago
Fede.- 76ada2843c Merge branch 'adjustment2' of Disroot/Disroot-Privacy-Policy into Privacy_Statement_Draft 3 years ago
meaz a70b206157 adjustment for better viewing in website repo 3 years ago
Fede.- 3d2da8cfc5 Removing all non-style code
All internal links code were removed
3 years ago
Fede.- 86edd01a33 Minor fixes on general text 3 years ago
Fede.- 31d613460b Update on "About this Document" text 3 years ago
Fede.- db0f4040fe "About this document" text fix 3 years ago
Fede.- 8a7996a3f8 Fixed some missing lines of the "About this document" text 3 years ago
Fede.- aacd7505c2 - Added notice about translations
- Modified the Changes section text
3 years ago
Fede.- 954ddf03d0 Fixed last update date 3 years ago
Fede.- 794c86eb3e Added link to changes' history. 3 years ago
Fede.- f4d6903f4b Update on Privacy Statement Draft 3 years ago
Fede.- 9fff29ad04 Outdated PP 3 years ago
Fede.- 01bd12737a Privacy Statement draft updated 3 years ago
Fede.- 7a4e3f17ea Added calc and pads modifications to Pads privacy notes 4 years ago
Fede.- d5e0c04f63 Actualizar 'pp_draft.md' 4 years ago
Fede.- b84f9b8003 PP text updated 4 years ago
Fede.- 018ca5195c Added Administrative data collection info 4 years ago
Fede.- 4ba9bf3e5e Actualizar 'pp_draft.md' 4 years ago
Fede.- ab70c631c4 Added "Changes on this PP"
Text needs revision
4 years ago
Fede.- 0e787fc6af Actualizar 'pp_draft.md' 4 years ago
Fede.- d86dd9bacf Actualizar 'pp_draft.md' 4 years ago
Fede.- 1c92c42012 Fixes on PP coverage + What data do we collect + Services names + Chat information + PP Disroot email added 4 years ago
Fede.- 5c5babf9a1 Actualizar 'pp_draft.md' 4 years ago
Fede.- ed007f7024 Privacy Policy complete draft 4 years ago
Fede.- 1df59a03c8 Merge branch '7.1.Access_to_information' of Disroot/Disroot-Privacy-Policy into master 4 years ago
Fede.- 1df7116dc9 Info added 4 years ago
Fede.- 9e734db177 Merge branch '1.What_it_covers' of Disroot/Disroot-Privacy-Policy into master 4 years ago
Fede.- a177515b8e Actualizar 'privacy_policy.md' 4 years ago
Fede.- d7af2b8b86 Actualizar 'privacy_policy.md' 4 years ago
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.
4 years ago