This website requires JavaScript.
cd41bf575b
Merge pull request 'add Translate, Movim and Scribe information, remove Forum and Project Board, backup info update' (#46 ) from 1.5 into main
main
meaz
2024-02-25 13:08:04 +0000
e0d5643af3
info about backup + add plural
#46
meaz
2024-02-25 14:07:30 +0100
81dfec078b
DE translation 1.5
avg_joe
2024-02-24 16:24:16 +0100
8235e6a861
Spanish translation update
Fede.-
2024-02-22 00:23:49 -0300
26306877f4
update French
meaz
2024-02-20 22:28:07 +0100
5990f9deb2
implement floss4good's suggestion
meaz
2024-02-20 21:24:45 +0100
e5645cf5f5
updated backup section
muppeth
2024-02-19 00:44:27 +0100
26bb501a1c
Change to February, update numbering, update changelog
meaz
2024-02-14 07:03:00 +0100
af70b3f905
remove changelog as it is already in the file itself
meaz
2024-02-14 07:02:02 +0100
de64dc3148
add Translate, Movim and Scribe information, remove Forum and Project Board
meaz
2023-12-31 10:27:44 +0100
f75a51a9d3
Merge pull request 'add info about default retention time on lufi' (#45 ) from lufi_size into main
meaz
2023-07-29 10:05:52 +0000
7010f35d0e
update changelog and version number
#45
lufi_size
meaz
2023-04-08 22:27:04 +0200
81a0c99383
add info about default retention time on lufi
meaz
2023-04-08 22:24:24 +0200
a9fa139d73
Merge pull request 'remove doublon in French' (#44 ) from fix_french into main
meaz
2023-02-25 18:35:07 +0000
3fda0f6043
remove doublon in French
#44
fix_french
meaz
2023-02-25 19:34:24 +0100
b46dae41a6
change master to main in changelog links (#43 )
meaz
2023-02-11 08:09:44 +0000
fb06b6d2c6
change master to main in changelog links
#43
master-main
meaz
2023-02-11 09:09:05 +0100
44277dd654
Add Pleroma section (#35 )
meaz
2023-01-27 12:37:41 +0000
42a6e9e550
Merge branch 'master' into pleroma
#35
meaz
2023-01-27 12:37:27 +0000
90a6401e3a
Merge pull request 'Spanish translation of the Privacy Statement' (#40 ) from pp.SP.translation into master
Fede.-
2023-01-27 02:04:27 +0000
47428e6f54
add french translation of backup section
meaz
2023-01-23 14:51:22 +0100
783d6a0aa5
small typo on backup section
meaz
2023-01-23 14:49:38 +0100
167cfc0039
1.3 backup - changed wording
muppeth
2023-01-23 00:07:03 +0100
6c6c4028e8
1.3 data backup initial add
muppeth
2023-01-22 01:00:16 +0100
4b6973fd2c
small fixes
meaz
2022-12-18 14:16:49 +0100
c820aff72a
change to webmail.disroot.org on en,fr,de
avg_joe
2022-12-18 13:35:40 +0100
7a139dc70e
v1.3 added akkoma to german version
avg_joe
2022-12-18 13:29:52 +0100
9f1f05010e
update french
meaz
2022-12-18 07:45:12 +0100
ac52669379
change date + changelog
meaz
2022-12-18 07:45:06 +0100
9dddb37bc7
replaced pleroma with akkoma
muppeth
2022-12-17 15:18:54 +0100
992b6aa1d8
Merge branch 'pleroma' of https://git.disroot.org/Disroot/Disroot-Privacy-Policy into pleroma
meaz
2022-12-17 08:09:55 +0100
9c6fbb618f
Merge branch 'master' into pleroma
meaz
2022-12-17 08:06:41 +0100
d26ca40e7a
small update
meaz
2022-12-17 08:02:50 +0100
524cb9e4a8
Merge branch 'master' into pp.SP.translation
#40
meaz
2022-11-12 17:48:52 +0000
fe7e544dc2
changed xmpp file retention period (#42 )
muppeth
2022-10-15 18:06:44 +0000
8d7521ae02
Merge branch 'xmpp-file-retention' of git.disroot.org:Disroot/Disroot-Privacy-Policy into xmpp-file-retention
#42
muppeth
2022-09-23 23:41:36 +0200
50c99306db
fixed broken link to changelog
muppeth
2022-09-23 23:40:27 +0200
99ec6d84e5
Merge branch 'master' into pp.SP.translation
meaz
2022-09-21 15:51:16 +0000
045589cca4
Merge branch 'master' into xmpp-file-retention
meaz
2022-09-21 15:28:01 +0000
3d68c6fa0c
add information about the fact that pads can not be deleted by users (#41 )
meaz
2022-09-06 14:54:12 +0000
69391fadfc
month singular in german
avg_joe
2022-09-06 12:04:00 +0200
caf6035b29
changed xmpp file retention period
muppeth
2022-09-06 00:04:00 +0200
d53c57258b
german translation about deleting pads
#41
avg_joe
2022-03-19 13:15:30 +0100
ff71ce1c20
add information about the fact that pads can not be deleted by users
meaz
2022-03-19 10:22:08 +0100
18b8964cb6
Spanish translation of the Privacy Statement
Fede.-
2022-03-10 01:05:46 -0300
50e4e2b462
Merge branch 'master' into pleroma
meaz
2022-03-04 15:38:15 +0000
7c442f12a8
Remove framadate and ethercalc (#38 )
meaz
2022-03-01 21:38:03 +0000
9d6b147a54
Change numbers we removed polls
#38
meaz
2022-02-07 17:59:45 +0100
bce0f80b31
remove polls
meaz
2022-02-07 17:57:56 +0100
d6bbfc9699
remove ethercalc
meaz
2022-02-07 17:56:18 +0100
c6ac90dd7b
Merge branch 'master' into pleroma
meaz
2022-02-07 11:14:15 +0100
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 )
Rainer Bielefeld
2022-01-31 19:13:52 +0000
fadbf20957
replace hubzilla by pleroma in federated services list
meaz
2022-01-26 21:37:36 +0100
548f963435
remove hubzilla
#36
meaz
2022-01-26 21:35:43 +0100
c9753c89a9
Minor change of intro and format repair
shadowsword
2022-01-25 22:07:54 +0100
04fa0e66ee
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
Rainer Bielefeld
2022-01-15 10:13:13 +0100
5c205dd0ac
first draft of Pleroma PP
meaz
2021-12-19 18:16:55 +0100
a350e70eac
Merge pull request 'Add a changelog' (#34 ) from changelog into master
meaz
2021-06-11 12:05:59 +0000
2f6dcfae76
add link to changelog
#34
meaz
2021-05-02 09:52:19 +0200
5662c14e30
add changelog
meaz
2021-05-02 09:52:15 +0200
572ed561e3
Merge pull request 'French translation of PS' (#32 ) from French into master
meaz
2020-12-05 23:28:00 +0000
188e0a37e6
French translation of PS
#32
meaz
2020-04-14 09:20:13 +0200
e17fd2057e
Merge pull request 'List Fixed' (#31 ) from Fix-List into master
meaz
2020-03-30 09:27:15 +0000
525bbc72cc
List Fixed
#31
Fede.-
2020-03-29 02:32:56 +0000
f9ca03bce8
Merge pull request 'add info about cryptpad and mumble' (#30 ) from new_services into master
Fede.-
2020-03-29 02:29:23 +0000
821a328def
add info about cryptpad and mumble
#30
meaz
2020-03-28 11:26:47 +0100
ac3756f89a
Merge pull request 'Privacy_Statement_Draft' (#26 ) from Privacy_Statement_Draft into master
meaz
2020-03-11 13:50:13 +0000
c0ddc4e115
udpate the last update date
#26
meaz
2020-03-11 14:19:54 +0100
3df7973825
removed title
antil0pa
2020-03-11 11:59:08 +0100
56a05d3c60
adjusted page naming so it is can be cloned to website
antil0pa
2020-03-11 11:33:17 +0100
61d2412c6f
Removed Diaspora* from federated services examples
Fede.-
2020-03-11 02:48:14 +0000
c3023d75f9
added PS version
Muppeth
2020-03-10 23:44:30 +0100
d763739e48
changed xmpp retention to 1month; removed diaspora.
Muppeth
2020-03-10 23:03:42 +0100
76ada2843c
Merge branch 'adjustment2' of Disroot/Disroot-Privacy-Policy into Privacy_Statement_Draft
Fede.-
2020-03-04 19:52:21 +0000
a70b206157
adjustment for better viewing in website repo
#29
meaz
2020-03-01 19:06:37 +0100
8ed69cf921
Fix the file name
#28
#27
meaz
2020-02-22 10:07:08 +0000
c66649cfec
Change file name in order to use template on website
meaz
2020-02-22 10:50:42 +0100
41eb27c950
Add header info for css + remove TofC + add title
meaz
2020-02-22 10:43:01 +0100
177b249be0
improve displaying on website
meaz
2020-02-18 12:41:46 +0100
3d2da8cfc5
Removing all non-style code
Fede.-
2020-02-18 01:36:31 +0000
86edd01a33
Minor fixes on general text
Fede.-
2020-02-12 00:47:51 -0300
31d613460b
Update on "About this Document" text
Fede.-
2020-02-11 20:24:13 +0000
db0f4040fe
"About this document" text fix
Fede.-
2020-02-10 19:37:34 -0300
8a7996a3f8
Fixed some missing lines of the "About this document" text
Fede.-
2020-02-10 15:20:07 -0300
aacd7505c2
- Added notice about translations - Modified the Changes section text
Fede.-
2020-02-10 15:16:32 -0300
954ddf03d0
Fixed last update date
Fede.-
2020-02-09 19:15:32 +0000
794c86eb3e
Added link to changes' history.
Fede.-
2020-02-09 16:10:57 -0300
f4d6903f4b
Update on Privacy Statement Draft
Fede.-
2020-02-05 12:50:54 -0300
9fff29ad04
Outdated PP
#25
Fede.-
2020-02-01 03:14:58 +0000
01bd12737a
Privacy Statement draft updated
Fede.-
2020-02-01 00:05:09 -0300
7a4e3f17ea
Added calc and pads modifications to Pads privacy notes
#20
Fede.-
2019-11-13 19:43:38 +0000
d5e0c04f63
Actualizar 'pp_draft.md'
Fede.-
2019-11-13 18:49:54 +0000
b84f9b8003
PP text updated
Fede.-
2019-11-13 18:49:02 +0000
018ca5195c
Added Administrative data collection info
Fede.-
2019-11-13 18:46:10 +0000
4ba9bf3e5e
Actualizar 'pp_draft.md'
Fede.-
2019-11-04 19:42:40 +0000
ab70c631c4
Added "Changes on this PP"
Fede.-
2019-11-02 19:04:13 +0000
0e787fc6af
Actualizar 'pp_draft.md'
Fede.-
2019-10-30 13:05:33 +0000
d86dd9bacf
Actualizar 'pp_draft.md'
Fede.-
2019-10-29 19:05:14 +0000
1c92c42012
Fixes on PP coverage + What data do we collect + Services names + Chat information + PP Disroot email added
Fede.-
2019-10-29 15:59:00 -0300
5c5babf9a1
Actualizar 'pp_draft.md'
Fede.-
2019-10-27 15:06:14 +0000