Sync merged PRs with 15

15/umbraco-cms/.gitbook.yaml

@@ -105,3 +105,4 @@ redirects:
     tutorials/creating-a-backoffice-tour: tutorials/overview.md
     extending/packages/types-of-packages: extending/packages/README.md
     reference/configuration/nucachesettings: reference/configuration/cache-settings.md
+    fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/listview: fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/collection.md

15/umbraco-cms/SUMMARY.md

@@ -30,6 +30,8 @@
   * [Property Editors](fundamentals/backoffice/property-editors/README.md)
     * [Built-in Property Editors](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/README.md)
       * [Image Cropper](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/image-cropper.md)
+      * [Block Editors](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/README.md)
+        * [Block Grid](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/block-grid-editor.md)
 
 ## Implementation
 
@@ -83,6 +85,7 @@
   * [Web routing](reference/configuration/webroutingsettings.md)
 * [Querying & Models](reference/querying/README.md)
   * [ITagQuery](reference/querying/itagquery.md)
+  * [UmbracoContext helper](reference/querying/umbraco-context.md)
 * [Routing & Controllers](reference/routing/README.md)
   * [Routing in Umbraco](reference/routing/request-pipeline/README.md)
     * [IContentFinder](reference/routing/request-pipeline/icontentfinder.md)

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/README.md

@@ -14,7 +14,7 @@ Umbraco CMS currently ships with two Block Editors: the Block List and the Block
 
 ## Customizing Block Editors
 
-### [Build custom views for blocks](build-custom-view-for-blocks.md)
+### [Creating custom views for blocks](../../../../../tutorials/creating-custom-views-for-blocklist.md)
 
 Learn how to create custom views for the blocks used in your Block Grid or Block List property editors.
 

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/collection.md

@@ -0,0 +1,110 @@
+# Collection
+
+`Alias: Umbraco.ListView`
+
+`Returns: IEnumerable<IPublishedContent>`
+
+**Collection** displays a collection of categories when it is enabled on a Document Type with children.
+
+![Collection example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview.png)
+
+## Enable collection
+
+If enabled, editors will be able to see multiple children from a collection on a content node that has children. When not enabled, no collection will be shown and all children will be shown in the Content Tree.
+
+![Enable Collection example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/enable-listview.png)
+
+## Settings
+
+![Collection settings example](/14/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/images/list-view-settings.png)
+
+
+### Page Size
+
+Defines how many child content nodes you want to see per page. This will limit how many content items you will see in your collection. If you set it to 5, then only 5 content items will be shown in the collection.
+
+### Order By
+
+Will sort your collection by the selection you choose in the dropdown. By default it selects "Last edited" and you get the following three columns:
+
+* **Last edited** - When the content node was last edited and saved.
+* **Name** - Name of the content node(s).
+* **Created by** - This is the user who the content node was created by.
+
+You can add more sorting to this collection by adding more datatypes to the columns in the "Columns Displayed" section.
+
+### Order Direction
+
+You can select order of the content nodes displayed, "Acsending" or "Descending". The order is affected by the "Order By" selection.
+
+### Columns Displayed
+
+It is possible to add more columns to the collection, via adding the properties through the dropdown. These properties are based on the Data Types which are used by the Document Type. It will show up in the dropdown by its alias and not the name on the property.
+
+![Collection property example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-property.png) ![Collection property example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-property-dropdown.png)
+
+Once you have selected a column you want to display, define what its name should be and what kind of value it should display. You can also move the headers around, re-ordering how they should look. This is done by the move icon on the left side of the alias.
+
+The template section is where you define what kind of value you want to display. The value of the column is in the `value` variable.
+
+### Layouts
+
+Collection comes with two layouts by default. A list and a grid view. These views can be disabled if you are not interested in any of them.
+
+{% hint style="info" %}
+A minimum of one layout needs to be enabled for Collection to work.
+{% endhint %}
+
+You can also make your own layout and add it to the settings. For example, if you wanted to change the width or length of the grid, you will be able to do so.
+
+### Bulk Action Permissions
+
+Select what kind of action is available on the collection.
+
+* **Allow bulk publish** - content only
+* **Allow bulk unpublish** - content only
+* **Allow bulk copy** - content only
+* **Allow bulk move**
+* **Allow bulk delete**
+
+### Workspace View icon
+
+Changes the icon in the backoffice of the collection. By default it will look like the image below.
+
+![Collection icon example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/list-icon.png)
+
+### Workspace View name
+
+You can change the name of the collection itself. Default if empty: 'Child Items'.
+
+### Show Content Workspace View First
+
+Enable this to show the Content Workspace View by default instead of the collection's.
+
+## Content Example
+
+### Generic field value
+
+This example uses a generic field on a child item and displays it in the collection. ![Collection content example email](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-content-example-email-settings.png)
+
+The `{{ value }}` will take the value of the Email property and display it in the collection, as shown on the image below.
+
+![Collection content example email](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-content-example-email.png)
+
+### Member name
+
+First, a Member Picker property needs to be present on the content item. In this example, the `child item` has gotten a Member Picker Data Type with the alias of `isAuthor`.
+
+![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/member-picker.png)
+
+The child item has a member and the value that should be displayed is the name of the picked value. The next step is to reconfigure the template value in the collection setting.
+
+![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/member-picker-settings.png)
+
+This will take the value picked up by the member picker. ![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/picked-member.png)
+
+And display it in the collection. Shown in the example below: ![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/list-member-picked.png)
+
+### Other examples
+
+![Collection other examples](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/others.png) ![Collection other examples](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/others-result.png)

15/umbraco-cms/legacy-documentation/README.md

@@ -0,0 +1,21 @@
+---
+description: Resources and links for older versions of Umbrco CMS.
+---
+
+# Legacy Documentation
+
+This documentation platform covers only supported versions of the Umbraco CMS, excluding version 8. If you use an unsupported version, you need to go elsewhere.
+
+[Learn more about how long each major version of Umbraco is supported.](https://umbraco.com/products/knowledge-center/long-term-support-and-end-of-life/)
+
+## [Legacy versions on GitHub](https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions)
+
+When a major version of Umbraco CMS goes End of Life (EOL), the documentation for this version will be unpublished 3 months later.
+
+The documentation for all EOL versions will continue to be available on the [UmbracoDocs GitHub repository](https://github.com/umbraco/UmbracoDocs/tree/umbraco-eol-versions).
+
+## Our Umbraco
+
+The documentation for Umbraco 7 and 8 lives on [our.umbraco.com](https://our.umbraco.com/documentation/).
+
+<table data-card-size="large" data-view="cards"><thead><tr><th align="center"></th><th data-hidden></th><th data-hidden></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td align="center"><strong>Umbraco 7 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr><tr><td align="center"><strong>Umbraco 8 Documentation</strong></td><td></td><td></td><td></td><td><a href="https://our.umbraco.com/documentation/">https://our.umbraco.com/documentation/</a></td></tr></tbody></table>