Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/DIGITAL-25…
Browse files Browse the repository at this point in the history
…7-topics-diplay
  • Loading branch information
mattsqd committed Jan 21, 2025
2 parents c65f34d + b6f677f commit 5a6dfd2
Show file tree
Hide file tree
Showing 181 changed files with 3,323 additions and 1,417 deletions.
9 changes: 9 additions & 0 deletions .bp-config/php/fpm.d/stdout.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
; This makes the following config valid for the `www` pool
[www]

; Redirect worker stdout and stderr into main error log. If not set, stdout and
; stderr will be redirected to /dev/null according to FastCGI specs.
; Note: on highloaded environement, this can cause some delay in the page
; process time (several ms).
; Default Value: no
catch_workers_output = yes
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"drupal/admin_toolbar": "^3.4",
"drupal/auto_heading_ids": "^2.0@beta",
"drupal/autocomplete_deluxe": "^2.1",
"drupal/autologout": "^2.0",
"drupal/config_ignore": "^3.3",
Expand Down Expand Up @@ -63,6 +64,7 @@
"drupal/scheduler": "^2.0",
"drupal/scheduler_content_moderation_integration": "^3.0",
"drupal/seckit": "^2.0",
"drupal/svg_image": "^3.2",
"drupal/tome": "^1.12",
"drupal/twig_field_value": "^2.0",
"drupal/twig_tweak": "^3.3",
Expand Down
171 changes: 170 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions composer.log
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@ d9b88c3355f947a0ad6b677dfb2bd984|Matt Poole|feature/DIGITAL-307-update-deps|Fri
f5f559ecad3217a6dfc5db9f3157e5ca|Ray Estrada|feature/DIGITAL-283-security-modules|Mon Jan 13 12:13:10 EST 2025|./composer.sh require drupal/role_watchdog
cd50d2b2b036edaa3a002881cf1b50ce|Ray Estrada|feature/DIGITAL-283-security-modules|Mon Jan 13 12:15:05 EST 2025|./composer.sh require drupal/upgrade_status
406c28be9e70355b9cfbbe1df58bb7ef|Ray Estrada|feature/DIGITAL-283-security-modules|Mon Jan 13 12:16:28 EST 2025|./composer.sh require drupal/database_ssl_check
699e8eda61efbe69e1f9a75fe81a3bf4|Oscar Merida|feature/DIGITAL-299-auto-headings|Tue Jan 14 14:23:14 EST 2025|./composer.sh require drupal/auto_heading_ids:^2.0@beta
c4f5d0dc96584bd1dc808fd112b6e516|Ray Estrada|feature/DIGITAL-252-community-review|Thu Jan 16 10:51:08 EST 2025|./composer.sh require drupal/svg_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: 82bbc5f1-7a89-4790-8407-896442a08af3
langcode: en
status: true
dependencies:
config:
- node.type.guide_landing
id: node.guide_landing.promote
field_name: promote
entity_type: node
bundle: guide_landing
label: 'Promoted to front page'
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
22 changes: 22 additions & 0 deletions config/sync/core.base_field_override.node.guide_landing.status.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: 4364e4a5-14f6-47b3-b2e1-ffda3628e995
langcode: en
status: true
dependencies:
config:
- node.type.guide_landing
id: node.guide_landing.status
field_name: status
entity_type: node
bundle: guide_landing
label: Published
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
32 changes: 26 additions & 6 deletions config/sync/core.entity_form_display.media.image.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,74 @@ langcode: en
status: true
dependencies:
config:
- field.field.media.image.field_caption
- field.field.media.image.field_credit
- field.field.media.image.field_media_image
- image.style.thumbnail
- media.type.image
module:
- image
- path
- text
id: media.image.default
targetEntityType: media
bundle: image
mode: default
content:
created:
type: datetime_timestamp
weight: 10
weight: 5
region: content
settings: { }
third_party_settings: { }
field_caption:
type: text_textfield
weight: 3
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_credit:
type: string_textfield
weight: 2
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_media_image:
type: image_image
weight: 0
weight: 1
region: content
settings:
progress_indicator: throbber
preview_image_style: thumbnail
third_party_settings: { }
name:
type: string_textfield
weight: -5
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
path:
type: path
weight: 30
weight: 6
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 100
weight: 7
region: content
settings:
display_label: true
third_party_settings: { }
uid:
type: entity_reference_autocomplete
weight: 5
weight: 4
region: content
settings:
match_operator: CONTAINS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ status: true
dependencies:
config:
- core.entity_form_mode.media.media_library
- field.field.media.image.field_caption
- field.field.media.image.field_credit
- field.field.media.image.field_media_image
- image.style.thumbnail
- media.type.image
module:
- image
- path
id: media.image.media_library
targetEntityType: media
bundle: image
Expand All @@ -30,6 +33,8 @@ content:
third_party_settings: { }
hidden:
created: true
field_caption: true
field_credit: true
name: true
publish_on: true
publish_state: true
Expand Down
Loading

0 comments on commit 5a6dfd2

Please sign in to comment.