Merge remote-tracking branch 'origin/1.x' into 1.x

pimcore · Oct 3, 2024 · edacfb1 · edacfb1
2 parents 6456487 + 9af442c
commit edacfb1
Show file tree

Hide file tree

Showing 23 changed files with 1,282 additions and 1,282 deletions.
diff --git a/...ba39ca-73cd-4463-8be5-0b9ace56a6ca/105.js → ...55ff5d-e749-481f-b185-b52f4c5643bf/105.js b/...ba39ca-73cd-4463-8be5-0b9ace56a6ca/105.js → ...55ff5d-e749-481f-b185-b52f4c5643bf/105.js
diff --git a/...4463-8be5-0b9ace56a6ca/105.js.LICENSE.txt → ...481f-b185-b52f4c5643bf/105.js.LICENSE.txt b/...4463-8be5-0b9ace56a6ca/105.js.LICENSE.txt → ...481f-b185-b52f4c5643bf/105.js.LICENSE.txt
diff --git a/...-73cd-4463-8be5-0b9ace56a6ca/core-dll.css → ...-e749-481f-b185-b52f4c5643bf/core-dll.css b/...-73cd-4463-8be5-0b9ace56a6ca/core-dll.css → ...-e749-481f-b185-b52f4c5643bf/core-dll.css
diff --git a/...a-73cd-4463-8be5-0b9ace56a6ca/core-dll.js → ...d-e749-481f-b185-b52f4c5643bf/core-dll.js b/...a-73cd-4463-8be5-0b9ace56a6ca/core-dll.js → ...d-e749-481f-b185-b52f4c5643bf/core-dll.js
diff --git a/...8be5-0b9ace56a6ca/core-dll.js.LICENSE.txt → ...b185-b52f4c5643bf/core-dll.js.LICENSE.txt b/...8be5-0b9ace56a6ca/core-dll.js.LICENSE.txt → ...b185-b52f4c5643bf/core-dll.js.LICENSE.txt
diff --git a/public/build/1455ff5d-e749-481f-b185-b52f4c5643bf/entrypoints.json b/public/build/1455ff5d-e749-481f-b185-b52f4c5643bf/entrypoints.json
@@ -0,0 +1,12 @@
+{
+  "entrypoints": {
+    "core-dll": {
+      "css": [
+        "/bundles/pimcorestudioui/build/1455ff5d-e749-481f-b185-b52f4c5643bf/core-dll.css"
+      ],
+      "js": [
+        "/bundles/pimcorestudioui/build/1455ff5d-e749-481f-b185-b52f4c5643bf/core-dll.js"
+      ]
+    }
+  }
+}
diff --git a/...0b9ace56a6ca/fonts/Lato-Bold.636be8de.ttf → ...b52f4c5643bf/fonts/Lato-Bold.636be8de.ttf b/...0b9ace56a6ca/fonts/Lato-Bold.636be8de.ttf → ...b52f4c5643bf/fonts/Lato-Bold.636be8de.ttf
diff --git a/...b9ace56a6ca/fonts/Lato-Light.c7400fca.ttf → ...52f4c5643bf/fonts/Lato-Light.c7400fca.ttf b/...b9ace56a6ca/fonts/Lato-Light.c7400fca.ttf → ...52f4c5643bf/fonts/Lato-Light.c7400fca.ttf
diff --git a/...ace56a6ca/fonts/Lato-Regular.9d883d54.ttf → ...f4c5643bf/fonts/Lato-Regular.9d883d54.ttf b/...ace56a6ca/fonts/Lato-Regular.9d883d54.ttf → ...f4c5643bf/fonts/Lato-Regular.9d883d54.ttf
diff --git a/...73cd-4463-8be5-0b9ace56a6ca/manifest.json → ...e749-481f-b185-b52f4c5643bf/manifest.json b/...73cd-4463-8be5-0b9ace56a6ca/manifest.json → ...e749-481f-b185-b52f4c5643bf/manifest.json
diff --git a/public/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/entrypoints.json b/public/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/entrypoints.json
@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "vendor": {
+      "js": [
+        "/bundles/pimcorestudioui/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/vendor.js"
+      ]
+    }
+  }
+}
diff --git a/public/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/manifest.json b/public/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/manifest.json
@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/vendor.js": "/bundles/pimcorestudioui/build/26acf208-2f23-4af3-ba2b-af6f1c73886a/vendor.js"
+}
diff --git a/...83b-25cd-43fb-94a1-7da2d6e03ffa/vendor.js → ...208-2f23-4af3-ba2b-af6f1c73886a/vendor.js b/...83b-25cd-43fb-94a1-7da2d6e03ffa/vendor.js → ...208-2f23-4af3-ba2b-af6f1c73886a/vendor.js
diff --git a/...b-94a1-7da2d6e03ffa/vendor.js.LICENSE.txt → ...3-ba2b-af6f1c73886a/vendor.js.LICENSE.txt b/...b-94a1-7da2d6e03ffa/vendor.js.LICENSE.txt → ...3-ba2b-af6f1c73886a/vendor.js.LICENSE.txt
diff --git a/public/build/977a4059-04bf-4b78-8ba2-a56e3c9052b6/entrypoints.json b/public/build/977a4059-04bf-4b78-8ba2-a56e3c9052b6/entrypoints.json
diff --git a/public/build/977a4059-04bf-4b78-8ba2-a56e3c9052b6/manifest.json b/public/build/977a4059-04bf-4b78-8ba2-a56e3c9052b6/manifest.json
diff --git a/public/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/entrypoints.json b/public/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/entrypoints.json
@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "main": {
+      "js": [
+        "/bundles/pimcorestudioui/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/main.js"
+      ]
+    }
+  }
+}
diff --git a/...a4059-04bf-4b78-8ba2-a56e3c9052b6/main.js → ...c6885-9e15-4a07-b7ac-b297dce23f1e/main.js b/...a4059-04bf-4b78-8ba2-a56e3c9052b6/main.js → ...c6885-9e15-4a07-b7ac-b297dce23f1e/main.js
diff --git a/...b78-8ba2-a56e3c9052b6/main.js.LICENSE.txt → ...a07-b7ac-b297dce23f1e/main.js.LICENSE.txt b/...b78-8ba2-a56e3c9052b6/main.js.LICENSE.txt → ...a07-b7ac-b297dce23f1e/main.js.LICENSE.txt
diff --git a/public/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/manifest.json b/public/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/manifest.json
@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/main.js": "/bundles/pimcorestudioui/build/cd2c6885-9e15-4a07-b7ac-b297dce23f1e/main.js"
+}
diff --git a/public/build/f32e883b-25cd-43fb-94a1-7da2d6e03ffa/entrypoints.json b/public/build/f32e883b-25cd-43fb-94a1-7da2d6e03ffa/entrypoints.json
diff --git a/public/build/f32e883b-25cd-43fb-94a1-7da2d6e03ffa/manifest.json b/public/build/f32e883b-25cd-43fb-94a1-7da2d6e03ffa/manifest.json
diff --git a/public/build/f6ba39ca-73cd-4463-8be5-0b9ace56a6ca/entrypoints.json b/public/build/f6ba39ca-73cd-4463-8be5-0b9ace56a6ca/entrypoints.json