Merge branch 'develop' into BKDK-449

Author: andriyun

.docker/os2web/settings/prod.settings.php

@@ -24,6 +24,17 @@
   'username' => getenv('MYSQL_USER'),
 ];
 
+$databases['migrate']['default'] = [
+  'database' => getenv('MIGRATE_MYSQL_DATABASE'),
+  'driver' => 'mysql',
+  'host' => getenv('MIGRATE_MYSQL_HOSTNAME'),
+  'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+  'password' => getenv('MIGRATE_MYSQL_PASSWORD'),
+  'port' => getenv('MIGRATE_MYSQL_PORT'),
+  'prefix' => '',
+  'username' => getenv('MIGRATE_MYSQL_USER'),
+];
+
 $settings['hash_salt'] = getenv('DRUPAL_HASH_SALT');
 
 $settings['file_temp_path'] = '../tmp';

.docksal/etc/php/php.ini

@@ -1,2 +1,4 @@
 memory_limit = -1
 error_log = '/var/www/logs/php-errors.log'
+#xdebug.profiler_enable = 1;
+#xdebug.profiler_output_dir = "/var/www/logs/xdebug"

.env.example

@@ -30,9 +30,17 @@
 ## Theme that is going to be used on installation process.
 # OS2WEB_THEME=
 
+## Migrate DB mysql variables.
+# MIGRATE_MYSQL_DATABASE=
+# MIGRATE_MYSQL_HOSTNAME=
+# MIGRATE_MYSQL_PASSWORD=
+# MIGRATE_MYSQL_PORT=
+# MIGRATE_MYSQL_USER=
 
 ## Variable used only in docker-compose.yaml
 # OS2WEB_TAG=
 # Meeting folder mounting credentials
 # OS2WEB_MEETINGS_MNT_HOST=
 # OS2WEB_MEETINGS_MNT_SHARES=
+## Port that is used on host machine for reaching out application
+# WEB_SERVER_PORT=8098

composer.json

@@ -46,14 +46,17 @@
         "cweagans/composer-patches": "^1.6.5",
         "drupal/access_latest": "^0.0.1",
         "drupal/anonymous_subscriptions": "1.x-dev@dev",
+        "drupal/ckeditor_iframe": "^2.1",
         "drupal/coder": "^8.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "^8.8.0",
         "drupal/core-composer-scaffold": "^8.8.0",
+        "drupal/fancy_file_delete": "^2.0",
         "drupal/gin": "^3.0",
         "drupal/gin_login": "^1.0@RC",
         "drupal/memcache": "^2.2",
         "drupal/monitoring": "^1.9",
+        "drupal/pdf_api": "^2.0",
         "drupal/quick_node_clone": "^1.14",
         "drupal/redirect_after_login": "^2.7",
         "drupal/siteimprove": "^1.10",
@@ -146,7 +149,11 @@
                 "Incorrect user lookup on Bulk deleting": "https://git.drupalcode.org/project/user_delete_reassign/-/commit/05076bbedb66f8471d023894a88b980c2ecdf8d5.patch"
             },
             "drupal/core": {
-                "Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch"
+                "Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch",
+                 "Allow edit Media items from Media Library modal dialog in CKEditor" : "https://www.drupal.org/files/issues/2021-04-21/3168868-13_0.patch"
+            },
+            "drupal/printable": {
+                "3214729 PDF filename is generated with it's location" : "https://git.drupalcode.org/issue/printable-3214729/-/commit/cbc98dbe864f82b4cc1da110d88097d0c4740bb9.patch"
             }
         }
     }