Disroot
/
Disroot-Privacy-Policy
8
0
Fork 0
Code Pull Requests Releases Activity

Add Pleroma section #35

Merged
meaz merged 18 commits from pleroma into master 2023-01-27 13:37:42 +01:00
Conversation 6 Commits 18 Files Changed 3 +59 -14
meaz commented 2021-12-19 18:17:57 +01:00
Owner
Copy Link
No description provided.
meaz added the
UPDATE
 label 2021-12-19 18:17:57 +01:00
muppeth was assigned by meaz 2021-12-19 18:17:57 +01:00
meaz self-assigned this 2021-12-19 18:17:57 +01:00
fede was assigned by meaz 2021-12-19 18:17:57 +01:00
antilopa was assigned by meaz 2021-12-19 18:17:57 +01:00
avg_joe was assigned by meaz 2021-12-19 18:17:57 +01:00
meaz added 1 commit 2021-12-19 18:17:59 +01:00
meaz added 1 commit 2022-01-26 21:37:41 +01:00
meaz commented 2022-01-26 21:55:09 +01:00
Author
Owner
Copy Link

@muppeth could you check this? I think we should merge this asap even if still in test as people are using it.

@muppeth could you check this? I think we should merge this asap even if still in test as people are using it.
meaz added 1 commit 2022-02-07 11:14:20 +01:00
meaz added 1 commit 2022-03-04 16:38:21 +01:00
meaz added 3 commits 2022-12-17 08:11:01 +01:00
muppeth added 1 commit 2022-12-17 15:19:00 +01:00
meaz changed title from [WIP] First draft of Pleroma PP to First draft of Pleroma PP 2022-12-18 07:40:28 +01:00
meaz changed title from First draft of Pleroma PP to Draft of Pleroma PP 2022-12-18 07:40:39 +01:00
meaz changed title from Draft of Pleroma PP to Pleroma 2022-12-18 07:40:50 +01:00
meaz changed title from Pleroma to Add Pleroma section 2022-12-18 07:41:01 +01:00
meaz added 2 commits 2022-12-18 07:45:19 +01:00
meaz commented 2022-12-18 07:45:50 +01:00
Author
Owner
Copy Link

@avg_joe could you do the German translation of this so that we can merge ? thanks a lot

@avg_joe could you do the German translation of this so that we can merge ? thanks a lot
avg_joe added 1 commit 2022-12-18 13:31:00 +01:00
avg_joe added 1 commit 2022-12-18 13:36:29 +01:00
avg_joe reviewed 2022-12-18 13:42:33 +01:00
fullbar.en.md Outdated
@ -220,0 +222,4 @@
## 4.15 - **Disroot Akkoma** (https://fe.disroot.org)
- This service requires login with **Disroot** credentials.
- Everything is stored on the server in it's original form (plain-text).
avg_joe commented 2022-12-18 13:42:33 +01:00
Owner
Copy Link

line 225 is a repetition to line 227

line 225 is a repetition to line 227
meaz marked this conversation as resolved
avg_joe reviewed 2022-12-18 13:42:49 +01:00
fullbar.en.md Outdated
@ -219,1 +219,4 @@
<a name="akkoma"></a>
<br>
## 4.15 - **Disroot Akkoma** (https://fe.disroot.org)
avg_joe commented 2022-12-18 13:42:49 +01:00
Owner
Copy Link

change to 4.14

change to 4.14
meaz marked this conversation as resolved
avg_joe reviewed 2022-12-18 13:43:02 +01:00
fullbar.en.md Outdated
@ -274,3 +284,4 @@
#### Last update of this Privacy Statement:
- December, 2022: add Akkoma information
- March 28th, 2020
avg_joe commented 2022-12-18 13:43:02 +01:00
Owner
Copy Link

remove March, 2020

remove March, 2020
meaz marked this conversation as resolved
avg_joe requested changes 2022-12-18 13:44:36 +01:00
avg_joe left a comment
Owner
Copy Link

small fixes

small fixes
meaz added 1 commit 2022-12-18 14:16:54 +01:00
meaz commented 2022-12-18 14:17:46 +01:00
Author
Owner
Copy Link

@muppeth @avg_joe @antilopa @fede could you please approve this (or suggest changes), so that I can merge ?

@muppeth @avg_joe @antilopa @fede could you please approve this (or suggest changes), so that I can merge ?
muppeth commented 2022-12-18 22:45:25 +01:00
Owner
Copy Link

Perhaps I could add also the part about backup into the same version?

Perhaps I could add also the part about backup into the same version?
meaz commented 2022-12-19 07:15:33 +01:00
Author
Owner
Copy Link

@muppeth that would be great indeed.

@muppeth that would be great indeed.
meaz commented 2022-12-29 09:47:12 +01:00
Author
Owner
Copy Link

@muppeth @antilopa @avg_joe we need 2 more approvals on this.

I would then merge it so that I go forward with Disroot/Disroot-Project#330, unless @muppeth you can add backup in the meantime.

@muppeth @antilopa @avg_joe we need 2 more approvals on this. I would then merge it so that I go forward with https://git.disroot.org/Disroot/Disroot-Project/issues/330, unless @muppeth you can add backup in the meantime.
fede approved these changes 2022-12-29 17:58:57 +01:00
muppeth added 1 commit 2023-01-22 01:00:23 +01:00
meaz reviewed 2023-01-22 10:20:56 +01:00
fullbar.en.md Outdated
@ -78,0 +79,4 @@
<br>
## 1.3. How do we backup your data?
Your data (eg. emails, uploaded files, databases) is backup on external server to allow attempt recovery from dataloss disaster. All data backup except for emails and nextlcoud's file uploads is done daily and backups are stored for period of 7 days. Due to amount of data used for emails and Nextcloud's file data, backups take considerable longer time to complete and thus we keep 7 last backups.
meaz commented 2023-01-22 10:20:56 +01:00
Author
Owner
Copy Link

Your data (eg. emails, uploaded files, databases)
Could you be more precise? Databases will be uncleared for lot of people, and uploaded files from what services?

All data backup except for emails and nextlcoud's file uploads is done daily

So what about emails and nextcloud if not daily?

Also, you wrote nextlcoud instead of nextcloud

`Your data (eg. emails, uploaded files, databases)` Could you be more precise? Databases will be uncleared for lot of people, and `uploaded files` from what services? `All data backup except for emails and nextlcoud's file uploads is done daily` So what about emails and nextcloud if not daily? Also, you wrote nextlcoud instead of nextcloud
muppeth commented 2023-01-23 00:07:31 +01:00
Owner
Copy Link

Thanks a lot for the feeback @meaz I have changed the wording a bit.

Thanks a lot for the feeback @meaz I have changed the wording a bit.
meaz commented 2023-01-23 14:51:57 +01:00
Author
Owner
Copy Link

I corrected a few typo and added the French translation of that part as I think it is good enough.

I corrected a few typo and added the French translation of that part as I think it is good enough.
muppeth added 1 commit 2023-01-23 00:07:09 +01:00
meaz added 2 commits 2023-01-23 14:51:32 +01:00
antilopa approved these changes 2023-01-24 08:26:31 +01:00
muppeth approved these changes 2023-01-27 00:07:07 +01:00
meaz added 1 commit 2023-01-27 13:37:31 +01:00
meaz merged commit 44277dd654 into master 2023-01-27 13:37:42 +01:00
meaz referenced this issue from a commit 2023-01-27 13:37:42 +01:00
Add Pleroma section (#35)
Sign in to join this conversation.
Reviewers
No reviewers
avg_joe
fede
antilopa
muppeth
Labels
Clear labels   
1.2

Document Version

  
FEEDBACK

Comments on the text

  
PRIVACYSTATEMENT

Privacy statement related

  
REVIEW

Needs revision

  
UPDATE

Update

No Label
1.2
FEEDBACK
PRIVACYSTATEMENT
REVIEW
UPDATE
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
muppeth
meaz
fede
antilopa
avg_joe
5 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Disroot/Disroot-Privacy-Policy#35
No description provided.
Delete Branch "pleroma"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?