Merge pull request #57 from OS2Forms/develop

stankut · web-flow · commit e4d043923f7d · 2023-10-03T12:12:30.000+03:00
Release 1.14.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ before starting to add changes.
 
 ## [Unreleased]
 
+## [1.14.0] - 03.10.2023
+
+- webform_embded remove
+- Adding cache_control_override as a soft dependency (composer only)
+- Installing cache_control_override module on hook_install
+
 ## [1.13.0] - 25.09.2023
 
 - Fixed missing icons on administration menu
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "drupal/core": "^9",
         "drush/drush": "^11.4",
         "os2forms/os2forms": "^3.6",
-        "os2web/os2web_simplesaml": "8.x-dev"
+        "os2web/os2web_simplesaml": "8.x-dev",
+        "drupal/cache_control_override": "^1.1|^2.0"
     },
     "require-dev": {
         "drupal/coder": "^8.3",
diff --git a/os2forms_forloeb_profile.info.yml b/os2forms_forloeb_profile.info.yml
@@ -83,7 +83,6 @@ install:
   - webform_access
   - webform_attachment
   - webform_composite
-  - webform_embed
   - webform_entity_print
   - webform_entity_print_attachment
   - webform_migrate
diff --git a/os2forms_forloeb_profile.install b/os2forms_forloeb_profile.install
@@ -41,6 +41,9 @@ function os2forms_forloeb_profile_install() {
     ->set('default', 'gin')
     ->set('admin', 'gin')
     ->save();
+
+  // Enable recommended (but optional) modules.
+  \Drupal::service('module_installer')->install(['cache_control_override']);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ function os2forms_forloeb_profile_install() {`
`41`	`41`	`->set('default', 'gin')`
`42`	`42`	`->set('admin', 'gin')`
`43`	`43`	`->save();`
	`44`	`+`
	`45`	`+ // Enable recommended (but optional) modules.`
	`46`	`+ \Drupal::service('module_installer')->install(['cache_control_override']);`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`/**`