Skip to content

Commit

Permalink
Merge branch 'develop' into feature/assemblies
Browse files Browse the repository at this point in the history
  • Loading branch information
paulinebessoles authored Jan 10, 2025
2 parents 9dba35c + ea6d8c4 commit 8683a67
Show file tree
Hide file tree
Showing 231 changed files with 1,544 additions and 842 deletions.
8 changes: 7 additions & 1 deletion .github/styles/config/vocabularies/Decidim/accept.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
[Aa]nonymised
Config
CSV
[Dd]ecidim
[Ee]mail
[Ff]aq
[Gg]amification
Keka
Mautic
[Mm]oderations
[Nn]ickame
[Oo]fficialization
[Oo]fficializing
[Oo]fficialize
[Oo]fficialized
[Rr]eoffficialize
[Uu]nreport
[Un]nfollow
[Uu]nhide
[Uu]npublish
[Uu]nreport
46 changes: 19 additions & 27 deletions docs/en/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -106,34 +106,26 @@
**** xref:admin:components/proposals/participatory_texts.adoc[Participatory texts]
*** xref:admin:components/sortitions.adoc[Sortitions]
*** xref:admin:components/surveys.adoc[Surveys]
** Features
*** xref:admin:features/badges.adoc[Badges]
*** xref:admin:features/comments.adoc[Comments]
*** xref:admin:features/conversations.adoc[Conversations]
*** xref:admin:features/endorsements.adoc[Endorsements]
*** xref:admin:features/fingerprint.adoc[Fingerprint]
*** xref:admin:features/follows.adoc[Follows]
*** xref:admin:features/my_account.adoc[My account]
**** xref:admin:features/my_account/account.adoc[Account]
**** xref:admin:features/my_account/notifications_settings.adoc[Notifications settings]
**** xref:admin:features/my_account/authorizations.adoc[Authorizations]
**** xref:admin:features/my_account/groups.adoc[Groups]
**** xref:admin:features/my_account/my_interests.adoc[My interests]
**** xref:admin:features/my_account/my_data.adoc[My data]
**** xref:admin:features/my_account/delete_my_account.adoc[Delete my account]
*** xref:admin:features/my_public_profile.adoc[My public profile]
**** xref:admin:features/my_public_profile/timeline.adoc[Timeline]
**** xref:admin:features/my_public_profile/activity.adoc[Activity]
**** xref:admin:features/my_public_profile/badges.adoc[Badges]
**** xref:admin:features/my_public_profile/follows.adoc[Follows]
**** xref:admin:features/my_public_profile/followers.adoc[Followers]
**** xref:admin:features/my_public_profile/groups.adoc[Groups]
*** xref:admin:features/notifications.adoc[Notifications]
** xref:admin:features.adoc[Features]
*** xref:admin:features/search.adoc[Search]
*** xref:admin:features/share.adoc[Share]
*** xref:admin:features/statistics.adoc[Statistics]
*** xref:admin:features/versions.adoc[Versions]
** xref:admin:newsletters.adoc[Newsletters]
*** xref:admin:features/social_features.adoc[Social features]
**** xref:admin:features/social_features/newsletters.adoc[Newsletters]
**** xref:admin:features/social_features/badges.adoc[Badges]
**** xref:admin:features/social_features/comments.adoc[Comments]
**** xref:admin:features/social_features/conversations.adoc[Conversations]
**** xref:admin:features/social_features/endorsements.adoc[Endorsements]
**** xref:admin:features/social_features/follows.adoc[Follows]
**** xref:admin:features/social_features/share.adoc[Share]
**** xref:admin:features/social_features/hashtags.adoc[Hashtags]
*** xref:admin:features/transparency_features.adoc[Transparency features]
**** xref:admin:features/transparency/statistics.adoc[Statistics]
**** xref:admin:features/transparency/versions.adoc[Versions]
**** xref:admin:features/transparency/fingerprint.adoc[Fingerprint]
*** xref:admin:features/participants_actions.adoc[Participant account and actions]
**** xref:admin:features/participant_actions/notifications.adoc[Notifications]
**** xref:admin:features/participant_actions/my_account.adoc[My account]
**** xref:admin:features/participant_actions/my_public_profile.adoc[My public profile]
**** xref:admin:features/participant_actions/group_profile.adoc[Group profiles]
** xref:admin:global_moderations.adoc[Global moderations]
*** xref:admin:moderations/reported_content.adoc[Reported content]
*** xref:admin:moderations/reported_users.adoc[Reported users]
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file modified docs/en/modules/admin/assets/images/features/comments/form.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/modules/admin/assets/images/features/comments/order_by.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Binary file modified docs/en/modules/admin/assets/images/features/metrics/page.png
Binary file modified docs/en/modules/admin/assets/images/features/versions/list.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/en/modules/admin/assets/images/icon_bell.png
Diff not rendered.
Binary file removed docs/en/modules/admin/assets/images/icon_bell_on.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified docs/en/modules/admin/assets/images/spaces/admins_form.png
Binary file modified docs/en/modules/admin/assets/images/spaces/attachments.png
Diff not rendered.
Binary file modified docs/en/modules/admin/assets/images/spaces/categories.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed docs/en/modules/admin/assets/images/user_sidebar.png
Diff not rendered.
14 changes: 14 additions & 0 deletions docs/en/modules/admin/pages/features.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
= Features

== Understand the basics

Decidim is mainly organized around xref:admin:spaces.adoc[Spaces] and xref:admin:components.adoc[Components], but also offers
a lot of other features, to enable administrators to keep the participants engaged, to encourage the collaboration and the
participation on the platform, etc.

For the readability of this documentation, they are divided in four different sections:

. *xref:admin:features/search.adoc[Search engine]*
. *xref:admin:features/social_features.adoc[Social features]*
. *xref:admin:features/transparency_features.adoc[Transparency features]*
. *xref:admin:features/participants_actions.adoc[Participant account and actions]*
64 changes: 0 additions & 64 deletions docs/en/modules/admin/pages/features/comments.adoc

This file was deleted.

57 changes: 0 additions & 57 deletions docs/en/modules/admin/pages/features/conversations.adoc

This file was deleted.

17 changes: 0 additions & 17 deletions docs/en/modules/admin/pages/features/endorsements.adoc

This file was deleted.

29 changes: 0 additions & 29 deletions docs/en/modules/admin/pages/features/fingerprint.adoc

This file was deleted.

27 changes: 0 additions & 27 deletions docs/en/modules/admin/pages/features/follows.adoc

This file was deleted.

5 changes: 0 additions & 5 deletions docs/en/modules/admin/pages/features/hashtags.adoc

This file was deleted.

19 changes: 0 additions & 19 deletions docs/en/modules/admin/pages/features/my_account.adoc

This file was deleted.

47 changes: 0 additions & 47 deletions docs/en/modules/admin/pages/features/my_account/account.adoc

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8683a67

Please sign in to comment.