Merge pull request #781 from UN-OCHA/develop

Develop -> Main - v2.6.0
UN-OCHA · Apr 17, 2024 · 301d93a · 301d93a
2 parents 6661a11 + 62f0ff5
commit 301d93a
Show file tree

Hide file tree

Showing 41 changed files with 982 additions and 547 deletions.
diff --git a/.docksal/docksal.env b/.docksal/docksal.env
@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
-DB_IMAGE="docksal/db:1.1-mysql-5.7"
+DB_IMAGE="docksal/mariadb:10.6"
 CLI_IMAGE='docksal/cli:php8.2-build'
diff --git a/composer.lock b/composer.lock
diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
@@ -15,6 +15,8 @@ dependencies:
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
+    - field.field.node.job.reliefweb_job_tagger_info
+    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - allowed_formats
@@ -189,6 +191,8 @@ hidden:
   field_import_hash: true
   langcode: true
   promote: true
+  reliefweb_job_tagger_info: true
+  reliefweb_job_tagger_status: true
   status: true
   sticky: true
   uid: true

diff --git a/config/core.entity_view_display.node.job.default.yml b/config/core.entity_view_display.node.job.default.yml
@@ -15,6 +15,8 @@ dependencies:
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
+    - field.field.node.job.reliefweb_job_tagger_info
+    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - datetime
@@ -114,3 +116,5 @@ hidden:
   field_import_hash: true
   langcode: true
   links: true
+  reliefweb_job_tagger_info: true
+  reliefweb_job_tagger_status: true
diff --git a/config/core.entity_view_display.node.job.teaser.yml b/config/core.entity_view_display.node.job.teaser.yml
@@ -16,6 +16,8 @@ dependencies:
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
+    - field.field.node.job.reliefweb_job_tagger_info
+    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - datetime
@@ -60,3 +62,5 @@ hidden:
   field_theme: true
   langcode: true
   links: true
+  reliefweb_job_tagger_info: true
+  reliefweb_job_tagger_status: true