Skip to content

Commit

Permalink
Merge branch 'develop' into feature/initiatives
Browse files Browse the repository at this point in the history
  • Loading branch information
paulinebessoles authored Jan 10, 2025
2 parents 8b0d828 + 2a5b78c commit a06dbfd
Show file tree
Hide file tree
Showing 195 changed files with 1,693 additions and 1,000 deletions.
3 changes: 3 additions & 0 deletions .github/styles/config/vocabularies/Decidim/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ CSV
[Dd]ecidim
[Ee]mail
[Ff]aq
[Ff]avicon
[Gg]amification
initializer
[Kk]akogawa
Keka
Mautic
[Mm]oderations
[Nn]ickame
[Oo]fficialization
Expand Down
35 changes: 20 additions & 15 deletions docs/en/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@
*** xref:services:social_providers.adoc[Social Providers]
* xref:admin:index.adoc[Admin]
** xref:admin:first_steps.adoc[First steps in Decidim]
** Settings
*** xref:admin:configuration.adoc[Configuration]
*** xref:admin:appearance.adoc[Appearance]
*** xref:admin:homepage.adoc[Homepage]
*** xref:admin:scopes.adoc[Scopes]
*** xref:admin:areas.adoc[Areas]
*** xref:admin:help_sections.adoc[Help sections]
** xref:admin:first_steps.adoc[First steps]
** xref:admin:settings.adoc[Settings]
*** xref:admin:settings/configuration.adoc[Configuration]
*** xref:admin:settings/appearance.adoc[Appearance]
*** xref:admin:settings/homepage.adoc[Homepage]
*** xref:admin:settings/scopes.adoc[Scopes]
*** xref:admin:settings/areas.adoc[Areas]
*** xref:admin:settings/help_sections.adoc[Help sections]
*** xref:admin:settings/allowed_external_domains.adoc[Allowed external domains]
** xref:admin:pages.adoc[Pages and Topics]
*** xref:admin:pages/pages.adoc[Pages]
*** xref:admin:pages/topics.adoc[Topics]
Expand All @@ -54,16 +55,20 @@
**** xref:admin:participants/authorizations/census.adoc[Organization's census]
** xref:admin:spaces.adoc[Spaces]
*** xref:admin:spaces/processes.adoc[Participatory Processes]
**** xref:admin:spaces/processes/phases.adoc[Phases]
**** xref:admin:spaces/processes/components.adoc[Components]
**** xref:admin:spaces/processes/categories.adoc[Categories]
**** xref:admin:spaces/processes/attachments.adoc[Attachments]
**** xref:admin:spaces/processes/admins.adoc[Process admins]
**** xref:admin:spaces/processes/private_participants.adoc[Private participants]
**** xref:admin:spaces/processes/moderations.adoc[Moderations]
**** xref:admin:spaces/processes/groups.adoc[Process Groups]
**** xref:admin:spaces/processes/types.adoc[Process Types]
**** xref:admin:spaces/processes/process_creation.adoc[Process creation]
***** xref:admin:spaces/processes/landing_page.adoc[Landing page]
***** xref:admin:spaces/processes/phases.adoc[Phases]
***** xref:admin:spaces/processes/components.adoc[Components]
***** xref:admin:spaces/processes/categories.adoc[Categories]
***** xref:admin:spaces/processes/attachments.adoc[Attachments]
***** xref:admin:spaces/processes/admins.adoc[Process admins]
***** xref:admin:spaces/processes/private_participants.adoc[Private participants]
***** xref:admin:spaces/processes/moderations.adoc[Moderations]
*** xref:admin:spaces/assemblies.adoc[Assemblies]
**** xref:admin:spaces/assemblies/types.adoc[Assembly types]
**** xref:admin:spaces/assemblies/assembly_creation.adoc[Assembly creation]
**** xref:admin:spaces/assemblies/components.adoc[Components]
**** xref:admin:spaces/assemblies/categories.adoc[Categories]
**** xref:admin:spaces/assemblies/attachments.adoc[Attachments]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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.
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_admin.png
Binary file modified docs/en/modules/admin/assets/images/spaces_visitor.png
81 changes: 0 additions & 81 deletions docs/en/modules/admin/pages/appearance.adoc

This file was deleted.

11 changes: 0 additions & 11 deletions docs/en/modules/admin/pages/areas.adoc

This file was deleted.

53 changes: 0 additions & 53 deletions docs/en/modules/admin/pages/configuration.adoc

This file was deleted.

23 changes: 0 additions & 23 deletions docs/en/modules/admin/pages/help_sections.adoc

This file was deleted.

101 changes: 0 additions & 101 deletions docs/en/modules/admin/pages/homepage.adoc

This file was deleted.

Loading

0 comments on commit a06dbfd

Please sign in to comment.