b46dae41a6
change master to main in changelog links ( #43 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #43
2023-02-11 08:09:44 +00:00
44277dd654
Add Pleroma section ( #35 )
...
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: #35
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-01-27 12:37:41 +00:00
90a6401e3a
Merge pull request 'Spanish translation of the Privacy Statement' ( #40 ) from pp.SP.translation into master
...
Reviewed-on: #40
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-01-27 02:04:27 +00:00
524cb9e4a8
Merge branch 'master' into pp.SP.translation
2022-11-12 17:48:52 +00:00
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>
2022-10-15 18:06:44 +00:00
99ec6d84e5
Merge branch 'master' into pp.SP.translation
2022-09-21 15:51:16 +00:00
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>
2022-09-06 14:54:12 +00:00
18b8964cb6
Spanish translation of the Privacy Statement
2022-03-10 01:05:46 -03:00
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
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
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
2f6dcfae76
add link to changelog
2021-05-02 09:52:19 +02:00
5662c14e30
add changelog
2021-05-02 09:52:15 +02:00
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
188e0a37e6
French translation of PS
2020-04-14 09:20:13 +02:00
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
525bbc72cc
List Fixed
...
Fixed wrong list numbers
2020-03-29 02:32:56 +00:00
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
821a328def
add info about cryptpad and mumble
2020-03-28 11:26:47 +01:00
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
c0ddc4e115
udpate the last update date
2020-03-11 14:19:54 +01:00
3df7973825
removed title
2020-03-11 11:59:08 +01:00
56a05d3c60
adjusted page naming so it is can be cloned to website
2020-03-11 11:33:17 +01:00
61d2412c6f
Removed Diaspora* from federated services examples
2020-03-11 02:48:14 +00:00
c3023d75f9
added PS version
2020-03-10 23:44:30 +01:00
d763739e48
changed xmpp retention to 1month; removed diaspora.
2020-03-10 23:03:42 +01:00
76ada2843c
Merge branch 'adjustment2' of Disroot/Disroot-Privacy-Policy into Privacy_Statement_Draft
2020-03-04 19:52:21 +00:00
a70b206157
adjustment for better viewing in website repo
2020-03-01 19:06:37 +01:00
3d2da8cfc5
Removing all non-style code
...
All internal links code were removed
2020-02-18 01:36:31 +00:00
86edd01a33
Minor fixes on general text
2020-02-12 00:47:51 -03:00
31d613460b
Update on "About this Document" text
2020-02-11 20:24:13 +00:00
db0f4040fe
"About this document" text fix
2020-02-10 19:37:34 -03:00
8a7996a3f8
Fixed some missing lines of the "About this document" text
2020-02-10 15:20:07 -03:00
aacd7505c2
- Added notice about translations
...
- Modified the Changes section text
2020-02-10 15:16:32 -03:00
954ddf03d0
Fixed last update date
2020-02-09 19:15:32 +00:00
794c86eb3e
Added link to changes' history.
2020-02-09 16:10:57 -03:00
f4d6903f4b
Update on Privacy Statement Draft
2020-02-05 12:50:54 -03:00
9fff29ad04
Outdated PP
2020-02-01 03:14:58 +00:00
01bd12737a
Privacy Statement draft updated
2020-02-01 00:05:09 -03:00
7a4e3f17ea
Added calc and pads modifications to Pads privacy notes
2019-11-13 19:43:38 +00:00
d5e0c04f63
Actualizar 'pp_draft.md'
2019-11-13 18:49:54 +00:00
b84f9b8003
PP text updated
2019-11-13 18:49:02 +00:00
018ca5195c
Added Administrative data collection info
2019-11-13 18:46:10 +00:00
4ba9bf3e5e
Actualizar 'pp_draft.md'
2019-11-04 19:42:40 +00:00
ab70c631c4
Added "Changes on this PP"
...
Text needs revision
2019-11-02 19:04:13 +00:00
0e787fc6af
Actualizar 'pp_draft.md'
2019-10-30 13:05:33 +00:00
d86dd9bacf
Actualizar 'pp_draft.md'
2019-10-29 19:05:14 +00:00
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
5c5babf9a1
Actualizar 'pp_draft.md'
2019-10-27 15:06:14 +00:00
ed007f7024
Privacy Policy complete draft
2019-10-27 10:26:10 -03:00
