Skip to content

Commit 249ba03

Browse files
committed
Merge branch 'main' into forms/release-13.3-14.1
2 parents 8fe0e54 + 6fd87db commit 249ba03

File tree

668 files changed

+7125
-5373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

668 files changed

+7125
-5373
lines changed

10/umbraco-cms/fundamentals/code/debugging/logging.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords: logging serilog messagetemplates logs v9 version9
66

77
In Umbraco we use the underlying logging framework of [Serilog](https://serilog.net/).
88

9-
Out of the box we write a JSON log file that contains a more rich logfile, that allows tools to perform searches & correlation on log patterns a lot easier.
9+
Out of the box, we write a JSON log file that contains a more detailed logfile. This allows tools to perform searches and correlations on log patterns more efficiently.
1010

1111
The default location of this file is written to `umbraco/Logs` and contains the Machine name, along with the date too:
1212

@@ -20,7 +20,7 @@ Serilog is a logging framework that allows us to do structured logging or write
2020
2021-08-10 09:33:23,677 [P25776/D1/T22] INFO Umbraco.Cms.Core.Services.Implement.ContentService - Document Home (id=1062) has been published.
2121
```
2222

23-
Here is an example of the same log message represented as JSON, you can see here we have much more information that would allow us to search & filter logs based on these properties with an appropriate logging system.
23+
Here is an example of the same log message represented as JSON. More information is available and allows you to search and filter logs based on these properties with an appropriate logging system.
2424

2525
```json
2626
{
@@ -46,13 +46,13 @@ Here is an example of the same log message represented as JSON, you can see here
4646
}
4747
```
4848

49-
To learn more about structured logging and message templates you can read more about it over on the [https://messagetemplates.org](https://messagetemplates.org) website or alternatively watch this video from the Serilog creator - [https://www.youtube.com/watch?v=OhmNp8UPEEg](https://www.youtube.com/watch?v=OhmNp8UPEEg)
49+
To learn more about structured logging and message templates you can read more about it over on the [https://messagetemplates.org](https://messagetemplates.org) website. Alternatively watch this video from the Serilog creator - [https://www.youtube.com/watch?v=OhmNp8UPEEg](https://www.youtube.com/watch?v=OhmNp8UPEEg)
5050

5151
## Writing to the log
5252

53-
Umbraco writes log messages, but you are also able to use the Umbraco logger to write the log file as needed, so you can get further insights and details about your implementation.
53+
Umbraco writes log messages, but you are also able to use the Umbraco logger to write the log file as needed. This allows you to gain further insights and details about your implementation.
5454

55-
Here is an example of using the logger to write an Information message to the log which will contain one property of **Name** which will output the name variable that is passed into the method
55+
Here is an example of using the logger to write an Information message to the log. It will contain one property, **Name**, which will output the name variable that is passed into the method.
5656

5757
```csharp
5858
using Microsoft.AspNetCore.Mvc;

10/umbraco-cms/reference/cache/examples/tags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For this example we're working with tags. On my site I have two tag properties:
1818

1919
We're going to expose an endpoint that allows us to get the tags from each group.
2020

21-
The tags from the `default` should be cached for a minute and the `blog` tags will be cached until site restart or if you publish a blog post node in the Backoffice.
21+
The tags from the `default` should be cached for a minute. The `blog` tags will be cached until site restart or if you publish a blog post node in the Backoffice.
2222

2323
## Example
2424

10/umbraco-cms/reference/querying/itagquery.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: "Working with tags in Umbraco"
77

88
# ITagQuery
99

10-
The `ITagQuery` interface is your primary way to work with tags in Umbraco, the interface allows you to get the various tags like content tags and media tags, as well as getting content by tag, for instance getting all content nodes with the "Umbraco" tag.
10+
The `ITagQuery` interface is your primary way to work with tags in Umbraco. This interface allows you to get different tags, such as content tags and media tags. It also lets you retrieve content by tag, for instance, getting all content nodes with the "Umbraco" tag.
1111

1212
## How to reference ITagQuery
1313

@@ -49,7 +49,7 @@ namespace UmbracoHelperDocs.Controllers
4949
```
5050

5151
{% hint style="warning" %}
52-
`ITagQuery` is a scoped service, meaning that it should only be injected into scoped or transient services, for more information see the official [Microsoft Documentation](https://docs.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#scoped)
52+
`ITagQuery` is a scoped service, meaning that it should only be injected into scoped or transient services. For more information see the official [Microsoft Documentation](https://docs.microsoft.com/en-us/dotnet/core/extensions/dependency-injection#scoped)
5353
{% endhint %}
5454

5555
## Examples
@@ -58,7 +58,7 @@ All examples are from a view using the injection shown above, but working with t
5858

5959
### GetAllContentTags([string tagGroup])
6060

61-
Get a collection of tags used by content items on the site, you can optionally pass in a group name to only list tags belonging to a specific tag group
61+
Get a collection of tags used by content items on the site. Optionally, you can pass in a group name to only list tags belonging to a specific tag group
6262

6363
```csharp
6464
@{
@@ -69,7 +69,7 @@ Get a collection of tags used by content items on the site, you can optionally p
6969

7070
### GetAllMediaTags([string tagGroup])
7171

72-
Get a collection of tags used by media items on the site, you can optionally pass in a group name to only list tags belonging to a specific tag group
72+
Get a collection of tags used by media items on the site. Optionally, you can pass in a group name to only list tags belonging to a specific tag group
7373

7474
```csharp
7575
@{
@@ -80,7 +80,7 @@ Get a collection of tags used by media items on the site, you can optionally pas
8080

8181
### GetAllMemberTags([string tagGroup])
8282

83-
Get a collection of tags used by members on the site, you can optionally pass in a group name to only list tags belonging to a specific tag group
83+
Get a collection of tags used by members on the site. Optionally, you can pass in a group name to only list tags belonging to a specific tag group
8484

8585
```csharp
8686
@{
@@ -91,7 +91,7 @@ Get a collection of tags used by members on the site, you can optionally pass in
9191

9292
### GetAllTags([string tagGroup])
9393

94-
Get a collection of tags used on the site, you can optionally pass in a group name to only list tags belonging to a specific tag group
94+
Get a collection of tags used on the site. Optionally, you can pass in a group name to only list tags belonging to a specific tag group
9595

9696
```csharp
9797
@{
@@ -152,7 +152,7 @@ Get a collection of tags by entity id (queries content, media and members), and
152152

153153
### GetTagsForProperty(int contentId, string propertyTypeAlias, [string tagGroup])
154154

155-
Get a collection of tags assigned to a property of an entity (queries content, media and members), and you can optionally filter by tag group as well
155+
Get a collection of tags assigned to a property of an entity (queries content, media and members). Optionally, you can filter by tag group as well
156156

157157
```csharp
158158
@{

10/umbraco-commerce/key-concepts/bulk-actions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ App_Plugins\MyPlugin\package.manifest
4040
5. Inject a bulk action inside the `umbraco-commerce-bulk-actions-config.js` by adding the following:
4141

4242
```csharp
43-
angular.module('umbracoCommerce')
44-
.config(['umbracoCommerceActionsProvider', function (umbracoCommerceActionsProvider) {
45-
umbracoCommerceActionsProvider.bulkActions.push(['myResource', function (myResource)
43+
angular.module('umbraco.commerce')
44+
.config(['ucActionsProvider', function (ucActionsProvider) {
45+
ucActionsProvider.bulkActions.push(['myResource', function (myResource)
4646
{
4747
return {
4848
name: 'My Action',
@@ -95,9 +95,9 @@ Only an `itemAction` or a `bulkAction` method can be defined for a bulk action c
9595
The following section display an example of a bulk action with dialog configuration step:
9696

9797
```csharp
98-
angular.module('umbracoCommerce')
99-
.config(['umbracoCommerceActionsProvider', function (umbracoCommerceActionsProvider) {
100-
umbracoCommerceActionsProvider.bulkActions.push(['$q', 'editorService', 'myResource', function ($q, editorService, myResource)
98+
angular.module('umbraco.commerce')
99+
.config(['ucActionsProvider', function (ucActionsProvider) {
100+
ucActionsProvider.bulkActions.push(['$q', 'editorService', 'myResource', function ($q, editorService, myResource)
101101
{
102102
return {
103103
name: 'My Action',

10/umbraco-forms/developer/working-with-data.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
meta.Title: Working with Umbraco Forms data
32
description: Developer documentation on working with Forms record data.
43
---
54

@@ -22,15 +21,15 @@ Returns all records with the state set to approved from all Forms on the Umbraco
2221
### GetApprovedRecordsFromFormOnPage
2322

2423
```csharp
25-
PagedResult<IRecord> GetApprovedRecordsFromFormOnPage(int pageId, Guid.Parse("formId"), int pageNumber, int pageSize)
24+
PagedResult<IRecord> GetApprovedRecordsFromFormOnPage(int pageId, Guid formId, int pageNumber, int pageSize)
2625
```
2726

2827
Returns all records with the state set to approved from the Form with the id = `formId` on the Umbraco page with the id = `pageId` as a `PagedResult<IRecord>`.
2928

3029
### GetApprovedRecordsFromForm
3130

3231
```csharp
33-
PagedResult<IRecord> GetApprovedRecordsFromForm(Guid.Parse("formId"), int pageNumber, int pageSize)
32+
PagedResult<IRecord> GetApprovedRecordsFromForm(Guid formId, int pageNumber, int pageSize)
3433
```
3534

3635
Returns all records with the state set to approved from the Form with the ID = `formId` as a `PagedResult<IRecord>`.
@@ -46,15 +45,15 @@ Returns all records from all Forms on the Umbraco page with the id = `pageId` as
4645
### GetRecordsFromFormOnPage
4746

4847
```csharp
49-
PagedResult<IRecord> GetRecordsFromFormOnPage(int pageId, Guid.Parse("formId"), int pageNumber, int pageSize)
48+
PagedResult<IRecord> GetRecordsFromFormOnPage(int pageId, Guid formId, int pageNumber, int pageSize)
5049
```
5150

5251
Returns all records from the Form with the id = `formId` on the Umbraco page with the id = `pageId` as a `PagedResult<IRecord>`.
5352

5453
### GetRecordsFromForm
5554

5655
```csharp
57-
PagedResult<IRecord> GetRecordsFromForm(Guid.Parse("formId"), int pageNumber, int pageSize)
56+
PagedResult<IRecord> GetRecordsFromForm(Guid formId, int pageNumber, int pageSize)
5857
```
5958

6059
Returns all records from the Form with the ID = formId as a `PagedResult<IRecord>`.

10/umbraco-forms/release-notes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,14 @@ This section contains the release notes for Umbraco Forms 8 and 10 including all
346346

347347
<summary>Version 8</summary>
348348

349+
[**8.13.16**](https://github.com/umbraco/Umbraco.Forms.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F8.13.16) **(October 15th 2024)**
350+
351+
* Added server-side validation of configured maximum length for short and long answer fields.
352+
353+
[**8.13.15**](https://github.com/umbraco/Umbraco.Forms.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F8.13.15) **(April 16th 2024)**
354+
355+
* Tightened path check used in middleware for restriction of access to form file uploads.
356+
349357
[**8.13.14**](https://github.com/umbraco/Umbraco.Forms.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F8.13.14) **(February 20th 2024)**
350358

351359
* Null checks on setting prevalue captions handling issues with upgraded form definitions [#1148](https://github.com/umbraco/Umbraco.Forms.Issues/issues/1148).

13/umbraco-cms/.gitbook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ redirects:
88
tutorials/add-azure-active-directory-authentication: tutorials/add-microsoft-entra-id-authentication.md
99
fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/nested-content: fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/block-list-editor
1010
tutorials/editors-manual/working-with-content/rich-text-editor: tutorials/editors-manual/working-with-content.md
11+
extending/packages/types-of-packages: extending/packages/README.md

13/umbraco-cms/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
* [Using Azure Blob Storage for Media and ImageSharp Cache](extending/filesystemproviders/azure-blob-storage.md)
192192
* [Configuring Azure Key Vault](extending/key-vault.md)
193193
* [Packages](extending/packages/README.md)
194-
* [Package Types](extending/packages/types-of-packages.md)
195194
* [Creating a Package](extending/packages/creating-a-package.md)
196195
* [Language file for packages](extending/packages/language-files-for-packages.md)
197196
* [Listing a Package on the Umbraco Marketplace](extending/packages/listing-on-marketplace.md)

13/umbraco-cms/extending/package-manifest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ To associate the hosted JSON schema file to all package.manifest files you will
303303

304304
### Setting up JetBrains Rider 2019+
305305

306-
To associate the hosted JSON schema file to all package.manifest files you will need to perform the following inside of Visual Studio 2015.
306+
To associate the hosted JSON schema file to all package.manifest files you will need to perform the following inside of JetBrains Rider 2019+.
307307

308308
* File -> Settings
309309
* Browse down to Editor -> File Types -> JSON

13/umbraco-cms/extending/packages/README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ An Umbraco Package can be many things, but is generally characterized by:
1313
- Adding or extending functionality in the Umbraco CMS
1414
- Empowering people to do more and/or do things more efficiently
1515
- Engaging community members in collaboration and sharing
16-
- Solving real life problems
16+
- Solving real-life problems
1717
- Inspiring people on what Umbraco can be made capable of
1818

1919
### Categories of packages
@@ -32,11 +32,11 @@ A package that can be categorized as a Schema Extension will extend the default
3232

3333
#### Management Extensions
3434

35-
A Management Extension package helps you manage your site, and provides information to the users. Management extensions typically contain custom sections or dashboards to facilitate site management. [Diplo God Mode](https://marketplace.umbraco.com/package/diplo.godmode) is an example of a comprehensive management extension package with additional tools and information.
35+
A Management Extension package helps you manage your site and provides information to the users. Management extensions typically contain custom sections or dashboards to facilitate site management. [Diplo God Mode](https://marketplace.umbraco.com/package/diplo.godmode) is an example of a comprehensive management extension package with additional tools and information.
3636

3737
#### Starter Kits
3838

39-
Starter kits are, as the name suggests, a package that helps you set up a starter version of whatever you want to build. Most starter kit packages are for starting a website, and include schema like Document Types and Templates as well as content nodes and media. There are also some specialized starter kits, for example for creating a blog. Umbraco HQ has released their [own starter kit](https://www.nuget.org/packages/Umbraco.TheStarterKit), that creates a small site with the most commonly used features.
39+
Starter kits are, as the name suggests, a package that helps you set up a starter version of whatever you want to build. Most starter kit packages are for starting a website, and include schema like Document Types and Templates as well as content nodes and media. There are also some specialized starter kits, for example for creating a blog. Umbraco HQ has released their [own starter kit](https://www.nuget.org/packages/Umbraco.TheStarterKit), which creates a small site with the most commonly used features.
4040

4141
#### Content Apps
4242

@@ -46,10 +46,6 @@ Content apps are almost like dashboards for content nodes that are intended to d
4646

4747
This type of package can be a lot of things, and can include a number of the other package types. They are generally integrating a larger system into Umbraco. A good example could be an e-commerce package such as [Umbraco Commerce](https://docs.umbraco.com/umbraco-commerce), that includes an entire webshop module for Umbraco.
4848

49-
## [Types of Packages](types-of-packages.md)
50-
51-
Packages for Umbraco 10 and above are installed as NuGet packages.
52-
5349
## [Creating a Package](creating-a-package.md)
5450

5551
This short tutorial will teach you how to create a package in the Umbraco backoffice. It will also give a quick overview of what a generated package will contain.

0 commit comments

Comments
 (0)