Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: UN-OCHA/ghi-site
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.13.11
Choose a base ref
...
head repository: UN-OCHA/ghi-site
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jan 23, 2025

  1. Copy the full SHA
    6b9379b View commit details
  2. Merge pull request #1294 from UN-OCHA/berliner/HPC-10032

    HPC-10032: Fix import issue with regards to the coordination menu
    berliner authored Jan 23, 2025
    Copy the full SHA
    f3137e4 View commit details
  3. Merge pull request #1296 from UN-OCHA/main

    Merge main back into develop after a production deployment by ralf.baumbach 2025-01-23.0957.
    berliner authored Jan 23, 2025
    Copy the full SHA
    a1faecf View commit details
  4. Copy the full SHA
    a0902fd View commit details
  5. Merge pull request #1297 from UN-OCHA/berliner/HPC-10032

    HPC-10032: Style changes for the mega menus
    berliner authored Jan 23, 2025
    Copy the full SHA
    df52c5e View commit details

Commits on Jan 27, 2025

  1. HPC-10037: Prevent fatal error when trying to edit data points withou…

    …t configured attachment
    berliner committed Jan 27, 2025
    Copy the full SHA
    1357df1 View commit details
  2. HPC-10037: Prevent warning in edge cases for attachments that are mis…

    …sing the caluclated fields even though it is part of the attachment prototype
    berliner committed Jan 27, 2025
    Copy the full SHA
    81ccfb1 View commit details
  3. Merge pull request #1298 from UN-OCHA/berliner/HPC-10037

    berliner/HPC 10037
    berliner authored Jan 27, 2025
    Copy the full SHA
    9e541e2 View commit details

Commits on Jan 28, 2025

  1. Copy the full SHA
    04eb129 View commit details
  2. HPC-10032: Use same bottom space for non-linked 3rd level mega menu i…

    …tems as is used for linked 3rd level items
    berliner committed Jan 28, 2025
    Copy the full SHA
    77ce459 View commit details
  3. Copy the full SHA
    91332fc View commit details
  4. Merge pull request #1299 from UN-OCHA/berliner/HPC-10036

    HPC-10036: Sync gho-story component styles from CM
    berliner authored Jan 28, 2025
    Copy the full SHA
    9ee39b4 View commit details
  5. Merge pull request #1300 from UN-OCHA/berliner/HPC-10032

    berliner/HPC 10032
    berliner authored Jan 28, 2025
    Copy the full SHA
    c4949c8 View commit details

Commits on Jan 29, 2025

  1. Copy the full SHA
    2017041 View commit details
  2. Copy the full SHA
    be9ad2e View commit details
  3. Merge pull request #1301 from UN-OCHA/berliner/HPC-10015

    HPC-10015: Sync some gho components from CM
    berliner authored Jan 29, 2025
    Copy the full SHA
    afb9aec View commit details
  4. Merge pull request #1302 from UN-OCHA/berliner/HPC-10022

    HPC-10022: Copy gho-separator component from CM
    berliner authored Jan 29, 2025
    Copy the full SHA
    44aee24 View commit details

Commits on Jan 30, 2025

  1. Copy the full SHA
    7d83e15 View commit details
  2. Merge pull request #1303 from UN-OCHA/berliner/HPC-10015

    HPC-10015: Sync gho-top-figures component from CM
    berliner authored Jan 30, 2025
    Copy the full SHA
    0cd8953 View commit details
  3. Merge pull request #1304 from UN-OCHA/release-versions/v1.13.12

    release versions/v1.13.12
    berliner authored Jan 30, 2025
    Copy the full SHA
    4bb1c66 View commit details
  4. Apply updates

    berliner committed Jan 30, 2025
    Copy the full SHA
    9ff3f56 View commit details

Commits on Jan 31, 2025

  1. Merge pull request #1305 from UN-OCHA/berliner/updates

    Apply updates
    berliner authored Jan 31, 2025
    Copy the full SHA
    573701c View commit details

Commits on Feb 2, 2025

  1. Merge pull request #1306 from UN-OCHA/main

    Merge main back into develop after a production deployment by ralf.baumbach 2025-01-30.1242.
    berliner authored Feb 2, 2025
    Copy the full SHA
    46db46e View commit details

Commits on Feb 3, 2025

  1. HPC-10038: Add tableau specific information to instructions on extern…

    …al widget configuration
    berliner committed Feb 3, 2025
    Copy the full SHA
    e58c059 View commit details
  2. HPC-10010: FTS logo in the governing entity table is not rendered pro…

    …perly.
    Aymen ESSID authored and berliner committed Feb 3, 2025
    Copy the full SHA
    f01228f View commit details
  3. Copy the full SHA
    e2e31bf View commit details
  4. Merge pull request #1307 from UN-OCHA/berliner/HPC-10038

    HPC-10038: Add tableau specific information to instructions on external widget configuration
    berliner authored Feb 3, 2025
    Copy the full SHA
    6410cdb View commit details
  5. Merge pull request #1286 from UN-OCHA/aessid/HPC-10010

    HPC-10010: FTS logo in the governing entity table is not rendered pro…
    berliner authored Feb 3, 2025
    Copy the full SHA
    9f55fc9 View commit details
  6. Copy the full SHA
    f3b3aae View commit details
  7. Copy the full SHA
    1e76e02 View commit details
  8. HPC-10017: Simplify style for links in link boxes, the issue with mis…

    …sing images will be addressed differently
    berliner committed Feb 3, 2025
    Copy the full SHA
    e576200 View commit details
  9. HPC-10017: Only render image if the file does actually exists, add in…

    …formation to config screen if the link can't be rendered, e.g. due to the target content not beeing publicly available
    berliner committed Feb 3, 2025
    Copy the full SHA
    c65b2f4 View commit details
  10. Copy the full SHA
    309da1f View commit details
  11. Merge pull request #1288 from UN-OCHA/aessid/HPC-10017

    HPC-10017: Visual bug in related article element that don't have images.
    berliner authored Feb 3, 2025
    Copy the full SHA
    e06e0b6 View commit details

Commits on Feb 6, 2025

  1. Apply updates

    berliner committed Feb 6, 2025
    Copy the full SHA
    2d3ffb9 View commit details
  2. Merge pull request #1310 from UN-OCHA/berliner/updates

    Apply updates
    berliner authored Feb 6, 2025
    Copy the full SHA
    eeb0d7e View commit details
  3. Merge pull request #1311 from UN-OCHA/release-versions/v1.13.13

    release versions/v1.13.13
    berliner authored Feb 6, 2025
    Copy the full SHA
    354cb20 View commit details
  4. Merge pull request #1312 from UN-OCHA/main

    Merge main back into develop after a production deployment by ralf.baumbach 2025-02-06.1938.
    berliner authored Feb 6, 2025
    Copy the full SHA
    b3627b8 View commit details

Commits on Feb 10, 2025

  1. HPC-10023: Revise revisions to prevent reverting content, fix warning…

    …s and also an issue with our overridden autocomplete matcher
    berliner committed Feb 10, 2025
    Copy the full SHA
    6368ffc View commit details

Commits on Feb 11, 2025

  1. Merge pull request #1313 from UN-OCHA/berliner/HPC-10023

    HPC-10023: Revise revisions to prevent reverting content, fix warnings and also an issue with our overridden autocomplete matcher
    berliner authored Feb 11, 2025
    Copy the full SHA
    89dc893 View commit details
  2. Copy the full SHA
    2e4fb9f View commit details
  3. Merge pull request #1314 from UN-OCHA/berliner/docksal-command

    Change name of docksal command
    berliner authored Feb 11, 2025
    Copy the full SHA
    d3850e5 View commit details

Commits on Feb 13, 2025

  1. Apply updates

    berliner committed Feb 13, 2025
    Copy the full SHA
    406e79c View commit details
  2. Merge pull request #1316 from UN-OCHA/berliner/updates

    Apply updates
    berliner authored Feb 13, 2025
    Copy the full SHA
    5bafb71 View commit details
  3. Copy the full SHA
    bef5378 View commit details
  4. Merge pull request #1317 from UN-OCHA/berliner/HPC-10065

    HPC-10065: Use overridden plan type abbreviation also in the map tooltips
    berliner authored Feb 13, 2025
    Copy the full SHA
    246413c View commit details
  5. Copy the full SHA
    06cdedf View commit details
  6. Merge pull request #1318 from UN-OCHA/berliner/HPC-10066

    HPC-10066: Remove invalid items from headline figures
    berliner authored Feb 13, 2025
    Copy the full SHA
    5478b05 View commit details
  7. Merge pull request #1319 from UN-OCHA/release-versions/v1.13.14

    release versions/v1.13.14
    berliner authored Feb 13, 2025
    Copy the full SHA
    b626864 View commit details

Commits on Feb 20, 2025

  1. chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…

    …test-traits packages.
    unocha-jenkins authored and berliner committed Feb 20, 2025
    Copy the full SHA
    dddbbfb View commit details
Showing with 578 additions and 398 deletions.
  1. +3 −3 .docksal/commands/{post-deploy → deploy}
  2. +5 −0 composer.json
  3. +306 −288 composer.lock
  4. +0 −4 composer.patches.json
  5. +1 −2 config/core.extension.yml
  6. +20 −0 config/monitoring.sensor_config.core_requirements_fpa.yml
  7. +2 −1 config/user.role.administrator.yml
  8. +0 −1 config/user.role.editor.yml
  9. +2 −1 config/user.role.global_editor.yml
  10. +0 −1 config/user.role.rpm_administrator.yml
  11. +2 −2 config/views.view.content.yml
  12. +89 −0 html/modules/custom/ghi_blocks/ghi_blocks.deploy.php
  13. +1 −1 html/modules/custom/ghi_blocks/src/Plugin/Block/Generic/ExternalWidget.php
  14. +3 −0 html/modules/custom/ghi_blocks/src/Plugin/Block/Generic/LinkCarousel.php
  15. +7 −1 html/modules/custom/ghi_blocks/src/Plugin/Block/Generic/Links.php
  16. +1 −1 html/modules/custom/ghi_blocks/src/Plugin/Block/GlobalPage/PlanOverviewMap.php
  17. +1 −1 html/modules/custom/ghi_blocks/src/Plugin/ConfigurationContainerItem/AttachmentData.php
  18. +12 −6 html/modules/custom/ghi_blocks/src/Plugin/ConfigurationContainerItem/CarouselItem.php
  19. +12 −1 html/modules/custom/ghi_blocks/src/Plugin/ConfigurationContainerItem/Link.php
  20. +1 −1 html/modules/custom/ghi_form_elements/src/Traits/AjaxElementTrait.php
  21. +2 −2 html/modules/custom/ghi_form_elements/src/Traits/CustomLinkTrait.php
  22. +1 −2 html/modules/custom/ghi_menu/src/GhiEntityAutocompleteMatcher.php
  23. +1 −1 html/modules/custom/ghi_plans/src/ApiObjects/Attachments/DataAttachment.php
  24. +1 −0 html/modules/custom/ghi_subpages_custom/src/Form/CustomSubpageWizard.php
  25. +4 −0 html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
  26. +1 −1 html/themes/custom/common_design_subtheme/components/gho-interactive-content/README.md
  27. +1 −1 ...emes/custom/common_design_subtheme/components/gho-interactive-content/gho-interactive-content.css
  28. +4 −0 html/themes/custom/common_design_subtheme/components/gho-separator/README.md
  29. +14 −0 html/themes/custom/common_design_subtheme/components/gho-separator/gho-separator.css
  30. +35 −39 html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css
  31. +2 −1 html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures--small.css
  32. +29 −20 html/themes/custom/common_design_subtheme/components/gho-top-figures/gho-top-figures.css
  33. +1 −1 html/themes/custom/common_design_subtheme/css/styles.css
  34. +9 −0 html/themes/custom/common_design_subtheme/sass/component-overrides/_gho-related-articles.scss
  35. +3 −13 html/themes/custom/common_design_subtheme/sass/ghi/_ghi-menu.scss
  36. +2 −1 html/themes/custom/common_design_subtheme/sass/ghi/_ghi-tooltips.scss
  37. +0 −1 html/themes/custom/common_design_subtheme/sass/ghi/blocks/_links.scss
6 changes: 3 additions & 3 deletions .docksal/commands/post-deploy → .docksal/commands/deploy
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#: exec_target = cli

## Run the typical commands for the post-deployment
## Run the typical commands for the deployment
##
## Usage: fin post-deploy
## Usage: fin deploy

# Environment variables passed from fin:
#
@@ -19,7 +19,7 @@ usage="$(basename "$0") [-h] [-i]
where:
-h show this help text
-i import a local backup before executing the post-deploy steps"
-i import a local backup before executing the deploy steps"

IMPORT_BACKUP=false

5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -178,6 +178,11 @@
"phpstan/extension-installer": true,
"php-http/discovery": true,
"tbachert/spi": true
},
"audit": {
"ignore": {
"CVE-2025-24374": "Believed not to affect Drupal core see https://www.drupal.org/project/drupal/issues/3503195."
}
}
},
"autoload": {
Loading