Merge with develop

decidim · Nov 20, 2024 · 7b6c119 · 7b6c119
2 parents 9037ddb + 3170457
commit 7b6c119
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 331 deletions.
diff --git a/docs/en/modules/ROOT/nav.adoc b/docs/en/modules/ROOT/nav.adoc
@@ -24,17 +24,13 @@
 ** xref:services:index.adoc[Services]
 *** xref:services:activejob.adoc[Active Job]
 *** xref:services:activestorage.adoc[Active Storage]
-*** xref:services:elections_bulletin_board.adoc[Elections Bulletin Board]
 *** xref:services:etherpad.adoc[Etherpad]
 *** xref:services:maps.adoc[Maps]
 *** xref:services:sms.adoc[SMS]
 *** xref:services:smtp.adoc[SMTP]
 *** xref:services:social_providers.adoc[Social Providers]
 
 * Admin
-** xref:admin:index.adoc[Introduction]
-*** xref:admin:system.adoc[System panel]
-*** xref:admin:dashboard.adoc[Dashboard]
 ** Settings
 *** xref:admin:configuration.adoc[Configuration]
 *** xref:admin:appearance.adoc[Appearance]
@@ -110,11 +106,9 @@
 *** xref:admin:features/badges.adoc[Badges]
 *** xref:admin:features/comments.adoc[Comments]
 *** xref:admin:features/conversations.adoc[Conversations]
-*** xref:admin:features/embed.adoc[Embed]
 *** xref:admin:features/endorsements.adoc[Endorsements]
 *** xref:admin:features/fingerprint.adoc[Fingerprint]
 *** xref:admin:features/follows.adoc[Follows]
-*** xref:admin:features/metrics.adoc[Metrics]
 *** 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]
@@ -137,12 +131,15 @@
 *** xref:admin:features/versions.adoc[Versions]
 ** xref:admin:newsletters.adoc[Newsletters]
 ** xref:admin:global_moderations.adoc[Global moderations]
+<<<<<<< HEAD
 ** Deprecated
 *** xref:admin:information-pages.adoc[Information pages]
 ** xref:admin:templates.adoc[Templates]
 *** xref:admin:templates/questionnaires.adoc[Questionnaires templates]
 *** xref:admin:templates/block_users.adoc[Block user messages]
 *** xref:admin:templates/proposal_answers.adoc[Proposal answers]
+=======
+>>>>>>> develop
 
 * xref:contribute:index.adoc[Contribute]
 ** xref:contribute:governance.adoc[Governance]
@@ -188,7 +185,7 @@
 *** xref:develop:fixing_locales.adoc[Fixing locales]
 *** xref:develop:maps.adoc[Maps]
 *** xref:develop:managing_translations_i18n.adoc[i18n]
-*** xref:develop:maintainers/index.adoc[Maintainers]
+*** Maintainers
 **** xref:develop:backports.adoc[Backports]
 **** xref:develop:guide_github_projects.adoc[GitHub Projects Workflow]
 **** xref:develop:maintainers/releases.adoc[Releasing new versionss]

diff --git a/...s/processes/process-type-edit-process.png → .../processes/process-types-edit-process.png b/...s/processes/process-type-edit-process.png → .../processes/process-types-edit-process.png
diff --git a/docs/en/modules/admin/assets/images/system-dashboard.png b/docs/en/modules/admin/assets/images/system-dashboard.png
diff --git a/docs/en/modules/admin/assets/images/system-log_in.png b/docs/en/modules/admin/assets/images/system-log_in.png
diff --git a/docs/en/modules/admin/pages/dashboard.adoc b/docs/en/modules/admin/pages/dashboard.adoc
diff --git a/docs/en/modules/admin/pages/features/embed.adoc b/docs/en/modules/admin/pages/features/embed.adoc
diff --git a/docs/en/modules/admin/pages/features/metrics.adoc b/docs/en/modules/admin/pages/features/metrics.adoc
diff --git a/docs/en/modules/admin/pages/information-pages.adoc b/docs/en/modules/admin/pages/information-pages.adoc