Merge pull request #424 from UN-OCHA/develop

Develop -> Main - v1.2.0
UN-OCHA · Jul 21, 2022 · 1554c78 · 1554c78
2 parents 9b48c49 + 7c558a8
commit 1554c78
Show file tree

Hide file tree

Showing 42 changed files with 1,485 additions and 609 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -3,9 +3,6 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
-        "drupal/inline_entity_form": {
-            "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
-        },
         "drupal/migrate_tools" : {
             "https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
         },

diff --git a/config/core.entity_form_display.media.file_report.default.yml b/config/core.entity_form_display.media.file_report.default.yml
diff --git a/config/core.entity_form_display.media.file_report.media_library.yml b/config/core.entity_form_display.media.file_report.media_library.yml
diff --git a/config/core.entity_view_display.media.file_report.default.yml b/config/core.entity_view_display.media.file_report.default.yml
diff --git a/config/core.entity_view_display.media.file_report.media_library.yml b/config/core.entity_view_display.media.file_report.media_library.yml
diff --git a/config/field.field.media.file_report.field_description.yml b/config/field.field.media.file_report.field_description.yml
diff --git a/config/field.field.media.file_report.field_language.yml b/config/field.field.media.file_report.field_language.yml
diff --git a/config/field.field.media.file_report.field_media_file.yml b/config/field.field.media.file_report.field_media_file.yml
diff --git a/config/field.field.node.report.field_file.yml b/config/field.field.node.report.field_file.yml
@@ -22,4 +22,6 @@ default_value_callback: ''
 settings:
   file_extensions: 'csv doc docx jpg jpeg odp ods odt pdf png pps ppt pptx svg xls xlsx zip'
   max_filesize: ''
+  preview_max_filesize: 5MB
+  preview_min_dimensions: 700x100
 field_type: reliefweb_file
diff --git a/config/field.storage.media.field_language.yml b/config/field.storage.media.field_language.yml
diff --git a/config/field.storage.media.field_media_file.yml b/config/field.storage.media.field_media_file.yml
diff --git a/config/language.content_settings.media.file_report.yml b/config/language.content_settings.media.file_report.yml
diff --git a/config/media.type.file_report.yml b/config/media.type.file_report.yml
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
@@ -37,6 +37,7 @@ weight: 4
 is_admin: null
 permissions:
   - 'access editorial guidelines'
+  - 'access taxonomy overview'
   - 'add content to books'
   - 'add guideline entities'
   - 'administer google tag manager'