Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue resulting from a conflict in block reference #327

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Fix issue resulting from a conflict in block reference #327

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10b30e9
Fix issue resulting from a conflict in block reference
dabrt Jan 27, 2025
1463096
Update file again
dabrt Jan 27, 2025
a13a989
Revert "Update file again"
dabrt Jan 27, 2025
0c6da0a
Update file again due to GitHub hiccup
dabrt Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions docs/getting_started/dashboard/dashboard_block_reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,8 @@
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.
adriendupuis marked this conversation as resolved.
Show resolved Hide resolved
>>>>>>> 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.

Expand Down Expand Up @@ -171,4 +166,4 @@
- **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.
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.

Check warning on line 169 in docs/getting_started/dashboard/dashboard_block_reference.md

View workflow job for this annotation

GitHub Actions / vale

[vale] docs/getting_started/dashboard/dashboard_block_reference.md#L169 

[Ibexa.DontCapitalize] Don't capitalize 'Design' if inside the sentence.
Raw output 
{"message": "[Ibexa.DontCapitalize] Don't capitalize 'Design' if inside the sentence.", "location": {"path": "docs/getting_started/dashboard/dashboard_block_reference.md", "range": {"start": {"line": 169, "column": 10}}}, "severity": "WARNING"}
Loading