Merge remote-tracking branch 'origin/11.x' into 11.0

pimcore · Jun 21, 2023 · 22fc775 · 22fc775
2 parents a4d6e96 + 765c62a
commit 22fc775
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.docker/supervisord.conf b/.docker/supervisord.conf
@@ -13,7 +13,7 @@ stdout_logfile_maxbytes=0
 redirect_stderr=true
 
 [program:maintenance]
-command=bash -c 'sleep 3600 && exec php /var/www/html/bin/console pimcore:maintenance --async'
+command=bash -c 'sleep 3600 && exec php /var/www/html/bin/console pimcore:maintenance'
 autostart=true
 autorestart=true
 stdout_logfile=/dev/fd/1

diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "gotenberg/gotenberg-php": "^1.1"
   },
   "suggest": {
-    "elasticsearch/elasticsearch": "Required for Elastic Search service"
+    "pimcore/elasticsearch-client": "Required for Elastic Search service"
   },
   "autoload": {
     "psr-4": {

diff --git a/dump/data-1-settings_store.sql b/dump/data-1-settings_store.sql
@@ -31,7 +31,7 @@ INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('8','pimcore_cus
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('8','pimcore_predefined_properties','{\"name\":\"Print Register Type\",\"description\":\"Defines color and size of register.\",\"key\":\"print_register_type\",\"type\":\"select\",\"data\":\"\",\"config\":\"orange,red,violett,green,blue,yellow\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1566309612,\"modificationDate\":1643206317}','string');
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('9','pimcore_predefined_properties','{\"name\":\"Print Register Title\",\"description\":\"Defines title for register.\",\"key\":\"print_register_title\",\"type\":\"text\",\"data\":\"\",\"config\":\"\",\"ctype\":\"document\",\"inheritable\":true,\"creationDate\":1566309660,\"modificationDate\":1643206319}','string');
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('system_settings','pimcore_system_settings','{\"general\":{\"domain\":\"\",\"redirect_to_maindomain\":false,\"language\":\"en\",\"valid_languages\":[\"en\",\"de\",\"fr\"],\"fallback_languages\":{\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"default_language\":\"en\",\"debug_admin_translations\":false},\"documents\":{\"versions\":{\"days\":null,\"steps\":null},\"error_pages\":{\"default\":\"\",\"localized\":{\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}},\"objects\":{\"versions\":{\"days\":null,\"steps\":null}},\"assets\":{\"versions\":{\"days\":null,\"steps\":null}},\"email\":[]}','string');
-INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('admin_system_settings','pimcore_admin_system_settings','{\"branding\":{\"login_screen_invert_colors\":false,\"color_login_screen\":\"\",\"color_admin_interface\":\"\","color_admin_interface_background\":\"\",\"login_screen_custom_image\":\"\"},\"assets\":{\"hide_edit_image\":false,\"disable_tree_preview\":true}}','string');
+INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('admin_system_settings','pimcore_admin_system_settings','{\"branding\":{\"login_screen_invert_colors\":false,\"color_login_screen\":\"\",\"color_admin_interface\":\"\","color_admin_interface_background\":\"\",\"login_screen_custom_image\":\"\"},\"assets\":{\"hide_edit_image\":false,\"disable_tree_preview\":false}}','string');
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('assets','pimcore_data_hub','{\"general\":{\"active\":true,\"type\":\"graphql\",\"name\":\"assets\",\"description\":\"\",\"group\":\"\",\"sqlObjectCondition\":\"\",\"modificationDate\":1640088588,\"path\":null,\"createDate\":1640088588},\"schema\":{\"queryEntities\":[],\"mutationEntities\":[],\"specialEntities\":{\"document\":{\"read\":false,\"create\":false,\"update\":false,\"delete\":false},\"document_folder\":{\"read\":false,\"create\":false,\"update\":false,\"delete\":false},\"asset\":{\"read\":true,\"create\":false,\"update\":false,\"delete\":false},\"asset_folder\":{\"read\":true,\"create\":false,\"update\":false,\"delete\":false},\"asset_listing\":{\"read\":false,\"create\":false,\"update\":false,\"delete\":false},\"object_folder\":{\"read\":false,\"create\":false,\"update\":false,\"delete\":false}}},\"security\":{\"method\":\"datahub_apikey\",\"apikey\":\"9e265983fbd2dc42b8f7cdb841c82807\",\"skipPermissionCheck\":false,\"disableIntrospection\":true},\"workspaces\":{\"asset\":[{\"read\":true,\"cpath\":\"\\/Brand Logos\",\"create\":false,\"update\":false,\"delete\":false,\"id\":\"extModel14963-1\"},{\"read\":true,\"cpath\":\"\\/Car Images\",\"create\":false,\"update\":false,\"delete\":false,\"id\":\"extModel4621-1\"}],\"document\":[],\"object\":[]}}','string');
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('BUNDLE_INSTALLED__Pimcore\\Bundle\\AdminBundle\\PimcoreAdminBundle','pimcore','1','bool');
 INSERT INTO settings_store (`id`,`scope`,`data`,`type`) VALUES ('BUNDLE_INSTALLED__CustomerManagementFrameworkBundle\\PimcoreCustomerManagementFrameworkBundle','pimcore','1','bool');