From 10b30e98fbe8de11c6743b51c9d384f963c510e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C4=85browski?= <64841871+dabrt@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:23:45 +0100 Subject: [PATCH 1/4] Fix issue resulting from a conflict in block reference --- .../getting_started/dashboard/dashboard_block_reference.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/getting_started/dashboard/dashboard_block_reference.md b/docs/getting_started/dashboard/dashboard_block_reference.md index 348c0bd4..87b7a6f2 100644 --- a/docs/getting_started/dashboard/dashboard_block_reference.md +++ b/docs/getting_started/dashboard/dashboard_block_reference.md @@ -92,13 +92,8 @@ The table contains the following columns: Name, Image, Code, Category, Type, Var On the **Properties** tab, set values in the following fields: - **Name** - Enter a name for the block. -<<<<<<< HEAD - **Number of products to be displayed** - Set a number of products to be displayed. Default value = 10. - **Stock** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number will be displayed). Default value = 10. -======= -- **Number of visible products** - Set a number of products to be displayed. Default value = 10, minimum value = 1, and maximum = 10. -- **Stock threshold** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number are displayed). Default value = 10. ->>>>>>> 2b18e53 (IBX-8916: Content update in User documentation - cd. (#314)) On the **Design** tab, in the **View** field, select the layout to be used to present a list of products and submit your changes. @@ -171,4 +166,4 @@ On the **Properties** tab, set values in the following fields: - **Name** - Enter a name for the block. - **Customer Id** - Select customer Id whose top 10 clicks are displayed. -On the **Design** tab, in the **View** field, select the layout to be used to present a list of content items for review and submit your changes. \ No newline at end of file +On the **Design** tab, in the **View** field, select the layout to be used to present a list of content items for review and submit your changes. From 1463096e9d631b77239616cfa96b393780b3d38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C4=85browski?= <64841871+dabrt@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:35:49 +0100 Subject: [PATCH 2/4] Update file again @adriendupuis , thank you! --- docs/getting_started/dashboard/dashboard_block_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting_started/dashboard/dashboard_block_reference.md b/docs/getting_started/dashboard/dashboard_block_reference.md index 87b7a6f2..0ea283bc 100644 --- a/docs/getting_started/dashboard/dashboard_block_reference.md +++ b/docs/getting_started/dashboard/dashboard_block_reference.md @@ -92,8 +92,8 @@ The table contains the following columns: Name, Image, Code, Category, Type, Var On the **Properties** tab, set values in the following fields: - **Name** - Enter a name for the block. -- **Number of products to be displayed** - Set a number of products to be displayed. Default value = 10. -- **Stock** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number will be displayed). Default value = 10. +- **Number of visible products** - Set a number of products to be displayed. Default value = 10, minimum value = 1, and maximum = 10. +- **Stock threshold** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number are displayed). Default value = 10. On the **Design** tab, in the **View** field, select the layout to be used to present a list of products and submit your changes. From a13a989fdc54dffdc35de718f8fdf427cb347c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C4=85browski?= <64841871+dabrt@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:46:59 +0100 Subject: [PATCH 3/4] Revert "Update file again" This reverts commit 1463096e9d631b77239616cfa96b393780b3d38b. --- docs/getting_started/dashboard/dashboard_block_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting_started/dashboard/dashboard_block_reference.md b/docs/getting_started/dashboard/dashboard_block_reference.md index 0ea283bc..87b7a6f2 100644 --- a/docs/getting_started/dashboard/dashboard_block_reference.md +++ b/docs/getting_started/dashboard/dashboard_block_reference.md @@ -92,8 +92,8 @@ The table contains the following columns: Name, Image, Code, Category, Type, Var On the **Properties** tab, set values in the following fields: - **Name** - Enter a name for the block. -- **Number of visible products** - Set a number of products to be displayed. Default value = 10, minimum value = 1, and maximum = 10. -- **Stock threshold** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number are displayed). Default value = 10. +- **Number of products to be displayed** - Set a number of products to be displayed. Default value = 10. +- **Stock** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number will be displayed). Default value = 10. On the **Design** tab, in the **View** field, select the layout to be used to present a list of products and submit your changes. From 0c6da0aa04a44fc5bd0f60986022da44c4b5b4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C4=85browski?= <64841871+dabrt@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:49:09 +0100 Subject: [PATCH 4/4] Update file again due to GitHub hiccup --- docs/getting_started/dashboard/dashboard_block_reference.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting_started/dashboard/dashboard_block_reference.md b/docs/getting_started/dashboard/dashboard_block_reference.md index 87b7a6f2..0ea283bc 100644 --- a/docs/getting_started/dashboard/dashboard_block_reference.md +++ b/docs/getting_started/dashboard/dashboard_block_reference.md @@ -92,8 +92,8 @@ The table contains the following columns: Name, Image, Code, Category, Type, Var On the **Properties** tab, set values in the following fields: - **Name** - Enter a name for the block. -- **Number of products to be displayed** - Set a number of products to be displayed. Default value = 10. -- **Stock** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number will be displayed). Default value = 10. +- **Number of visible products** - Set a number of products to be displayed. Default value = 10, minimum value = 1, and maximum = 10. +- **Stock threshold** - Set up the maximum stock value (only products with stock number greater than zero and less than the set maximum number are displayed). Default value = 10. On the **Design** tab, in the **View** field, select the layout to be used to present a list of products and submit your changes.