Skip to content

Commit

Permalink
Merge pull request #3010 from ec-europa/nept-2956
Browse files Browse the repository at this point in the history
NEPT-2956: Upgrade wysiwyg to the latest version.
  • Loading branch information
julien- committed Jul 12, 2022
2 parents dc1498b + 533b09d commit 383c4f8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
10 changes: 7 additions & 3 deletions resources/multisite_drupal_standard.make
Original file line number Diff line number Diff line change
Expand Up @@ -931,12 +931,16 @@ projects[workbench_og][patch][] = patches/workbench_og_grants.patch
projects[wysiwyg][subdir] = "contrib"
projects[wysiwyg][version] = "2.9"
; CKEditor height does not reflect the rows attribute
; https://citnet.tech.ec.europa.eu/CITnet/jira/browse/NEPT-2185
; https://webgate.ec.europa.eu/CITnet/jira/browse/NEPT-2185
projects[wysiwyg][patch][2410565] = https://www.drupal.org/files/issues/2022-01-06/wysiwyg-heights.2410565.9.patch
; PHP 7.3 compliance.
projects[wysiwyg][patch][3261512] = https://www.drupal.org/files/issues/2022-02-01/wysiwyg-php7-compatibility-3261512_1.patch
; Error highlight missing on wysiwyg
; https://webgate.ec.europa.eu/CITnet/jira/browse/NEPT-2199
projects[wysiwyg][patch][2685519] = https://www.drupal.org/files/issues/wysiwyg-highlighting-required-field-error-2685519-2.patch
; Notice: Trying to access array offset on value of type bool
projects[wysiwyg][patch][3256637] = https://www.drupal.org/files/issues/2022-01-06/wysiwyg-markitup.3256637.4.patch
; PHP 7.3 compliance.
projects[wysiwyg][patch][3261512] = https://www.drupal.org/files/issues/2022-02-01/wysiwyg-php7-compatibility-3261512_1.patch


projects[xml_field][subdir] = "contrib"
projects[xml_field][version] = "2.3"
Expand Down
8 changes: 4 additions & 4 deletions tests/features/tmgmt/fast-track_custom-delay.feature
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Feature: Fast track
And I fill in the content's title with "Test page"
And I fill in "edit-delay-date-und-0-value-day" with "14"
And I fill in "edit-delay-date-und-0-value-month" with "11"
And I fill in "edit-delay-date-und-0-value-year" with "2019"
And I fill in "edit-delay-date-und-0-value-year" with "2020"
And I fill in "edit-delay-date-und-0-value-hour" with "12"
And I fill in "edit-delay-date-und-0-value-minute" with "00"
And I press "Save"
Expand All @@ -166,7 +166,7 @@ Feature: Fast track
| <titre>Test page</titre> |
| <organisationResponsable>DIGIT</organisationResponsable> |
| <organisationAuteur>IE/CE/DIGIT</organisationAuteur> |
| <serviceDemandeur>IE/CE/DIGIT</serviceDemandeur> |
| <serviceDemandeur>IE/CE/DIGIT</serviceDemandeur> |
| <applicationReference>FPFIS</applicationReference> |
| <delai>14/11/2019</delai> |
| <attributionsDelai>14/11/2019</attributionsDelai> |
| <delai>14/11/2020</delai> |
| <attributionsDelai>14/11/2020</attributionsDelai> |

0 comments on commit 383c4f8

Please sign in to comment.