Commit da6c5f13 authored by Thomas Citharel's avatar Thomas Citharel 🏃🏻
Browse files

Merge branch 'user-group-fixes' into 'master'

Variety of use -> groups and users fixes

See merge request !55
parents daf4da1c de982ad7
Pipeline #430023 passed with stage
in 12 seconds
......@@ -5,16 +5,16 @@
## Creation
=== "How to"
To create one, you have to:
To create a group, you have to:
1. click **My groups** button on top bar menu
* click **Create group** button
* (required) enter your group name in **Group display name** field
* (required) enter the federated groupe name you want (or just keep the one generated with your group display name) in **Federated Group Name** field (this is like your federated username for groups. It will allow you to be found on the federation, and is guaranteed to be unique)
1. click the **My groups** button on top bar menu
* click the **Create group** button
* (required) enter your group name in the **Group display name** field
* (required) enter the federated group name you want (or just keep the one generated with your group display name) in **Federated Group Name** field (this is like your federated username for groups. It will allow your group to be found on the federation, and is guaranteed to be unique)
* enter a description of what your group is about in **Description** field
* add an avatar for your group by selecting an image on your device, by clicking **Click to upload** button
* add a banner for your group by selecting an image on your device, by clicking **Click to upload** button
* click **Create my group** button
* add an avatar for your group by selecting an image on your device, by clicking the **Click to upload** button
* add a banner for your group by selecting an image on your device, by clicking the **Click to upload** button
* click the **Create my group** button
=== "Screenshot"
![creation group img](../../images/en/group-creation-EN.png)
......@@ -22,21 +22,21 @@
## Settings
=== "How to"
You can access to your group settings by:
You can access your group settings by:
1. clicking **My groups** button on top bar menu
* clicking the one you want to invite people on the list
* clicking **Group settings** button in your group banner
1. clicking the **My groups** button on top bar menu
* clicking the relevant group in the list
* clicking the **Group settings** button in your group banner
In this section you can edit informations added at the group creation (see above), like group name, description, avatar and banner. You also can:
In this section you can edit information the was added during the group creation (see above), like group name, description, avatar and banner. You also can:
* change **Group visibility**:
* **Visible everywhere on the web**: the group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on its page.
* **Only accessible through link**: you'll need to transmit the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or regular search engines.
* allow to join (or not) a group:
* **Anyone can join freely**: anyone wanting to be a member from your group will be able to from your group page
* **Visible everywhere on the web**: the group will be publicly listed in search results and may be suggested in the explore section. Only public information will be shown on its page.
* **Only accessible through link**: you'll need to share the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or by regular search engines.
* allow joining the group:
* **Anyone can join freely**: anyone wanting to be a member of your group will be able to from your group page
* **Manually invite new members**: the only way for your group to get new members is if an admininistrator invites them
* add **Group address**
* add **Group address** (location)
=== "Screenshot"
![creation settings img](../../images/en/group-creation-settings-EN.png)
......@@ -3,16 +3,16 @@
Keep the entire conversation about a specific topic together on a single page.
!!! note
You have to be moderator or administrator to start / edit / delete a discussion. See [roles](../../groups/roles-group/#roles).
You have to be a moderator or administrator to start / edit / delete a discussion. See [roles](../../groups/roles-group/#roles).
## Start a new discussion
To start a new discussion into your group, you have to, on your group page:
To start a new discussion in your group, you have to, on your group page:
1. click **+ Start a discussion** button in **Discussions** section
1. click the **+ Start a discussion** button in **Discussions** section
* add a title
* add a text
* click **Create the discussion** button
* add some text
* click the **Create the discussion** button
!!! note
You also can start a new discussion by clicking **View all**
......@@ -24,7 +24,7 @@ Your topic is now visible in the **Discussions** section. Everyone in the group
### Edit a discussion
To edit a title you have to:
To edit a title, you have to:
1. open the discussion by clicking its title in the group list
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
......@@ -33,7 +33,7 @@ To edit a title you have to:
* make changes
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
</svg> below the title field (or **x** to cancel you action)
</svg> below the title field (or **x** to cancel your action)
![gif discussion title edition](../../images/en/group-discussion-edit.gif)
......@@ -45,9 +45,9 @@ To delete a discussion, you have to:
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
</svg> in front of the title
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
* click the <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
</svg> **Delete conversation** button (or **x** to cancel you action)
</svg> **Delete conversation** button (or **x** to cancel your action)
![image discussion deleteion](../../images/en/group-discussion-delete.png)
......@@ -58,20 +58,20 @@ To delete a discussion, you have to:
### Edit a comment
To edit a comment you made you have to:
To edit a comment you made, you have to:
1. click **⋅⋅⋅** next to your comment date
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
</svg> **Edit**
* make changes
* click **Update** button below comment area
* click the **Update** button below comment area
### Delete a comment
To delete a comment you made you have to:
To delete a comment you made, you have to:
1. click **⋅⋅⋅** next to your comment date
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
* click the <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
</svg> **Delete** button
# Manage followers through the federation
# Manage group followers
## Management page
As a group administrator, you can manage [the users who subscribe to your group's feed through the federation](../../users/follow-federation/) by clicking on:
As a group administrator, you can manage [the users who subscribe to your group's feed](../../users/follow-federation/) by clicking on:
1. the **My Groups** tab on the top navigation bar
1. your group name
......@@ -11,4 +11,4 @@ As a group administrator, you can manage [the users who subscribe to your group'
## Reject a follower subscribe
To reject a subscription, you must, from the management page (see above) click on the **Reject** button in front of the subscription you want.
To reject a subscription, go to the management page (see above) and click on the **Reject** button in front of the subscription you want to reject.
......@@ -2,7 +2,7 @@
## Join a group
If the group is [configured to allow anyone to join the group without invitation](../../groups/create-group/#settings), you must click the **Join Group** button on the group page. If you are not logged in to your account, you will be prompted to do so.
If the group is [configured to allow anyone to join the group without invitation](../../groups/create-group/#settings), you can click the **Join Group** button on the group page. If you are not logged in to your account, you will be prompted to do so.
## Receive group public news
......@@ -11,7 +11,7 @@ It is possible to follow the public news of a group by using:
* RSS∕Atom feeds to be used with readers (web/applications)
* ICS/WebCal to be used with calendars supporting these formats.
To do this, you must, on the group page:
To do this, on the group page you can:
1. click on **⋅⋅⋅**
* right-click on **RSS/Atom feed** or **ICS/Webcal feed**
......@@ -21,12 +21,12 @@ To do this, you must, on the group page:
## Report a group
To report a group, you have to:
To report a group:
1. click ⋅⋅⋅ button
* click **Report** button:
1. click the ⋅⋅⋅ button
* click the **Report** button:
![report group image](../../images/en/report-group.png)
* [Optional but **recommended**] filling the report modal with a comment:
![groupe report modal image](../../images/en/report-group-modal.png)
* [Optional but **recommended**:] fill out the report modal with a comment:
![group report modal image](../../images/en/report-group-modal.png)
# Group post
A place to publish something to the whole world, your community or just your group members.
A place to publish something to the whole world, your community, or just your group members.
## Create group post
To create a new post, you have to go to your group managing page and click **+ Posting a public message** button:
To create a new post, you go to your group managing page and click the **+ Post a public message** button:
![image public page post](../../images/en/group-public-post.png)
......@@ -12,25 +12,25 @@ At this point you can:
1. add a banner
* add a title (required)
* add somme tags
* a your post text (required)
* add some tags
* add your post text (required)
* set who can see it:
* (default) Visible everywhere on the web
* Only accessible through link
* Only accessible to members of the group
Next: click **Publish** button to publish or **Save draft** if you want to publish later.
Next: click the **Publish** button to publish or **Save draft** if you want to publish later.
![image empty add new post template](../../images/en/group-add-new-post-template-empty.png)
## Edit a group post
To edit a post you have to be connected to your account and, on the post page, click on **Edit** link below post date.
To edit a post you have to be connected to your account and, on the post page, click on the **Edit** link below the post date.
![image edit post link](../../images/en/group-post-edit-link.png)
Once done, you have to click **Update post** button.
Once done, click the **Update post** button.
## Delete a group post
To delete a post you have to be connected to your account and, on the post page, click on **Edit** link below post date (see above) and click **Delete post** button.
To delete a post you have to be connected to your account and, on the post page, click on the **Edit** link below the post date (see above) and click the **Delete post** button.
# Group ressources
# Group resources
A place to store links to documents or resources of any type.
**Ressources** section allows you to add:
**Resources** section allows you to add:
* folder
* web links
* calc
* pad
* visioconference
* videoconference
![image add resources](../../images/en/group-add-ressources.png)
## Access to resources
To access to your group resources you have to be **at least** member of this group. Then, you have to:
To access to your group resources you have to be **at least** a member of this group. Then, you have to:
1. click **My groups** available in the top menu
* click the group you want to
* click **View all**
* click the group you want to access resources from
* click **View all** next to Resources
![title resources section](../../images/en/group-resource-title-EN.png)
## Add a resource
To add a resource you have to, [in resources page](#access-to-resources), click on **+** button and choose what kind of resource you want to add:
To add a resource you have to, [on the resources page](#access-to-resources), click on the **+** button and choose what kind of resource you want to add:
![image add resources](../../images/en/group-add-ressources.png)
### Add a new folder
To add a new folder you have to, [in resources page](#access-to-resources):
To add a new folder you have to, [on the resources page](#access-to-resources):
1. [click **+** button](#add-a-resource) (see above)
1. [click the **+** button](#add-a-resource) (see above)
* choose **New folder**
* add a name to this folder
* click **Create a folder** button
* click the **Create a folder** button
### Add a new link
To add a new link you have to, [in resources page](#access-to-resources):
To add a new link you have to, [on the resources page](#access-to-resources):
1. [click **+** button](#add-a-resource) (see above)
1. [click the **+** button](#add-a-resource) (see above)
* choose **New link**
* add the web link
* [optional] add a title (this will be automatically added, otherwise)
* [optional] add a description (this will be automatically added, otherwise)
* click **Create resource** button
* [optional] add a title (this will be automatically added if left blank)
* [optional] add a description (this will be automatically added if left blank)
* click the **Create resource** button
### Add a calc
To add a new calc you have to, [in resources page](#access-to-resources):
To add a new calc you have to, [on the resources page](#access-to-resources):
1. [click **+** button](#add-a-resource) (see above)
1. [click the **+** button](#add-a-resource) (see above)
* choose **Create a calc**
* choose a name for this calc
* click **Create a calc** button
* click the **Create a calc** button
!!! note
This calc will be create on a external website (configurable by the instance manager)
This calc will be created on an external website (configurable by the instance manager)
### Add a pad
To add a new pad you have to, [in resources page](#access-to-resources):
To add a new pad you have to, [on the resources page](#access-to-resources):
1. [click **+** button](#add-a-resource) (see above)
1. [click the **+** button](#add-a-resource) (see above)
* choose **Create a pad**
* choose a name for this pad
* click **Create a pad** button
* click the **Create a pad** button
!!! note
This pad will be create on a external website (configurable by the instance manager)
This pad will be created on an external website (configurable by the instance manager)
### Add a visioconference
### Add a videoconference
To add a new visioconference you have to, [in resources page](#access-to-resources):
To add a new videoconference you have to, [on the resources page](#access-to-resources):
1. [click **+** button](#add-a-resource) (see above)
* choose **Create a visioconference**
* choose a name for this visioconference
* click **Create a visioconference** button
1. [click the **+** button](#add-a-resource) (see above)
* choose **Create a videoconference**
* choose a name for this videoconference
* click **Create a videoconference** button
!!! note
This visioconference will be create on a external website (configurable by the instance manager)
This videoconference will be created on an external website (configurable by the instance manager)
## Rename a resource
To rename a folder or a file, you have to, [in resources page](#access-to-resources):
To rename a folder or a file, you have to, [on the resources page](#access-to-resources):
1. click **⋅⋅⋅** in front of the resource
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path fill="currentColor" d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
</svg> **Rename**
* make changes
* click **Rename resource** button
* click the **Rename resource** button
## Move a resource
You can move a file into a folder, or a folder into another one, etc… To do so, you have to, [in resources page](#access-to-resources):
You can move a file into a folder, or a folder into another one, etc… To do so, you have to, [on the resources page](#access-to-resources):
1. click **⋅⋅⋅** in front of the resource
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M14,18V15H10V11H14V8L19,13M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z" /></svg> **Move**
* choose where you want to move your resource
* once in the right place, click **Move resource to [FOLDER]** button
* choose where you want to move your resource to
* once in the right place, click the **Move resource to [FOLDER]** button
![gif showing file moving into a folder](../../images/en/move-resource-EN.gif)
## Delete a resource
To delete a resource tou have to, [in resources page](#access-to-resources):
To delete a resource you have to, [on the resources page](#access-to-resources):
1. click **⋅⋅⋅** in front of the resource
* click <svg style="width:24px;height:24px" viewBox="0 0 24 24">
......
......@@ -4,23 +4,23 @@
To invite accounts to your group, you have to:
1. click **My groups** button on top bar menu
* click the one you want to invite people on the list
* click **Add / Remove…** link in your group banner
* enter the new member ID in **Invite a new member** field
* click **Invite member** button
1. click the **My groups** button on the top bar menu
* click the group you want to invite people to in the list
* click the **Add / Remove…** link in your group banner
* enter the new member ID in the **Invite a new member** field
* click the **Invite member** button
Invited account will receive an email notification if [notifications are activated](../../users/account-settings/#email-notifications).
The invited account will receive an email notification if [notifications are activated](../../users/account-settings/#email-notifications).
!!! note
By default, invited account's role is **member**.
By default, the invited account's role is **member**.
## Being invited to join a group
When someone invites you to join a group (see above), you receive an email notification.
When someone invites you to join a group (see above), you will receive an email notification.
From **My groups** page, you either **accept** or **decline** this invitation.
From the **My groups** page, you either **accept** or **decline** this invitation.
!!! note
By default your role is **member**.
......
......@@ -17,40 +17,40 @@
![](../../images/en/group-members-list-EN.png)
When a person is invited and accept this invitation to join your group, she is, by default, *only* **member**.
When a person is invited and accepts this invitation to join your group, she is, by default, *only* a **member**.
## Promote
You can promote an account to **moderator** or **administrator** by:
1. clicking **My groups** button on top bar menu
1. clicking the **My groups** button on the top bar menu
* clicking the group you want to manage
* clicking **Add / Remove...** link in your group banner
* clicking **Promote** button in front of the user you want to promote.
* clicking the **Add / Remove...** link in your group banner
* clicking the **Promote** button in front of the user you want to promote.
!!! info
You only can promote **one level at the time**: **member** then **moderator** then **administrator**
You only can promote **one level at a time**: **member**, then **moderator**, then **administrator**
## Demote
You can demote an account to **administrator** by:
1. clicking **My groups** button on top bar menu
1. clicking the **My groups** button on the top bar menu
* clicking the group you want to manage
* clicking **Add / Remove...** link in your group banner
* clicking **Demote** button in front of the user you want to demote.
* clicking the **Add / Remove...** link in your group banner
* clicking the **Demote** button in front of the user you want to demote.
!!! info
You only can demote **one level at the time**: **administrator** then **moderator** then **member**
You only can demote **one level at a time**: **administrator**, then **moderator**, then **member**
## Remove
To remove a member you have to:
1. clicking **My groups** button on top bar menu
* clicking the group you want to manage
* clicking **Add / Remove...** link in your group banner
* click **Remove** button in front of the user
1. click the **My groups** button on the top bar menu
* click the group you want to manage
* click the **Add / Remove...** link in your group banner
* click the **Remove** button in front of the user
!!! note
If the user is a moderator or an administrator, you have to [demote](#demote) them first.
......@@ -30,7 +30,7 @@ This documentation aims to help you through the different options and features.
* [Group discussions](groups/discussion-group.md)
* [Group pages](groups/group-page.md)
* [Group post](groups/group-post.md)
* [Group ressources](groups/group-ressources.md)
* [Group resources](groups/group-resources.md)
### Administration & moderation
......
# Create an account
To be able to create several identities, events and groups, you have to create an account.
To be able to create identities, events and groups, you have to create an account.
## Sign up
Once you've found an instance that suits you, click **Sign up** button on the top bar. Then:
Once you've found an instance that suits you, click the **Sign up** button on the top bar. Then:
=== "How to"
1. enter your email address
* enter a password
* check **I agree the instance rules and terms of service** box (**after** reading them of course ;) )
* click **Register** button.
* check the **I agree the instance rules and terms of service** box (**after** reading them of course ;) )
* click the **Register** button.
=== "Screenshot"
![sign up page](../../images/en/rose-register-EN.png)
!!! note
At this point you must receive an email with a link to activate your account. If not, click the **Didn't receive the instructions?** link.
At this point you will receive an email with a link to activate your account. If you don't, click the **Didn't receive the instructions?** link.
## Activation
=== "How to"
Once activation done, you have to fill:
Once activation is done, you have to fill out:
1. a **Display name** (required): what other people will see
* a **Username** (required): your unique identifier for your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.
* a **Bio**: tell people more about you.
When everything is done, you have to click **Create my profile** button.
When everything is done, click the **Create my profile** button.
=== "Screenshot"
![bio page settings](../../images/en/rose-utopia-create-account-filled-EN.png)
......@@ -36,15 +36,15 @@ Once you've found an instance that suits you, click **Sign up** button on the to
## Settings
=== "How to"
**Timezone**
**Time Zone**
Mobilizon uses your timezone to make sure you get notifications for an event at the correct time. If the detected timezone isn't correct, you can change it by clicking **Manage my settings** button.
Mobilizon uses your time zone to make sure you get notifications for an event at the correct time. If the detected time zone isn't correct, you can change it by clicking the **Manage my settings** button.
**Participation notifications**
Mobilizon will send you an email when the events you are attending have important changes: date and time, address, confirmation or cancellation, etc. If you don't want those notifications: uncheck **Notification on the day of the event** box.
Mobilizon will send you an email when the events you are attending have important changes: date and time, address, confirmation or cancellation, etc. If you don't want those notifications: uncheck the **Notification on the day of the event** box.
When everything is ok for you, click **All good, let's continue!** button.
When everything is ok for you, click the **All good, let's continue!** button.
=== "Screenshot"
![settings image](../../images/en/creation-account-settings-EN.png)
# Your account settings
You can access to your account settings by clicking your avatar on the top bar and **My account**.
You can access your account settings by clicking your avatar on the top bar and then **My account**.
## General
......@@ -10,10 +10,10 @@ You can change the email you use to connect to your account. To do so, you have
1. click your avatar on the top bar
* click **My account**
* click **General** tab on left sidebar
* enter your new email in **New email** field
* enter your password in **Password** field
* click **Change my email** button.
* click the **General** tab on left sidebar
* enter your new email in the **New email** field
* enter your password in the **Password** field
* click the **Change my email** button.
!!! note
You'll receive a confirmation email.
......@@ -24,10 +24,10 @@ To change your password, you have to:
1. click your avatar on the top bar
* click **My account**
* click **General** tab on left sidebar
* enter your current one into **Old password** field
* enter your new one into **New password** field
* click **Change my password** button.
* click the **General** tab on left sidebar
* enter your current one into the **Old password** field
* enter your new one into the **New password** field
* click the **Change my password** button.
### Delete account
......@@ -39,10 +39,10 @@ To delete your account you have to:
1. click your avatar on the top bar
* click **My account**
* click **General** tab on left sidebar
* click **Delete my account** button
* click the **General** tab on left sidebar
* click the **Delete my account** button
* enter your password to confirm your action
* click **Delete everything** button.
* click the **Delete everything** button.
## Preferences
......@@ -50,22 +50,22 @@ You can choose the language of your Mobilizon interface and your timezone. To do
1. click your avatar on the top bar
* click **My account**
* click **Preferences** tab on left sidebar
* change the language or/and the timezone.
* click the **Preferences** tab on left sidebar
* change the language or/and the time zone.
## Email notifications
### Participation notifications
You can choose when you want to be notify by email.To do so, you have to:
You can choose when you want to be notified by email. To do so, you have to:
1. click your avatar on the top bar
* click **My account**
* click **Email notifications** tab on left sidebar
* click the **Email notifications** tab on left sidebar
* choose between:
* Notification on the day of the event
* Recap every week
* Notification before the event
* Notification on the day of the event
* Recap every week
* Notification before the event
### Organizer notifications
......
......@@ -6,18 +6,18 @@
You have the ability to view the activity of a group on a Mobilizon instance in your Mastodon/Pleroma feed. To do this you need to have an account on the Mastodon/Pleroma network, and then:
1. search for the moblizon group handle in Mastodon/Pleroma searchbar