Skip to content

Commit f726a7d

Browse files
AndyButlandAndyButland
committed
Merge branch 'release/17.0' of https://github.com/umbraco/Umbraco-CMS into release/17.0
2 parents 33c2838 + f6b566c commit f726a7d

File tree

59 files changed

+435
-601
lines changed

Some content is hidden

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

59 files changed

+435
-601
lines changed

‎.github/BUILD.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ In order to use Umbraco as a CMS and build your website with it, you should not
99
- Are you about to [create a pull request for Umbraco][contribution guidelines]?
1010
- Are you trying to get to the bottom of a problem in your existing Umbraco installation?
1111

12-
If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
12+
If the answer is yes, please read on. Otherwise, make sure to head on over [to the releases page](https://releases.umbraco.com) and start using Umbraco CMS as intended.
1313

1414
## Table of contents
1515

‎.github/contributing-first-issue.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You can get in touch with [the core contributors team][core collabs] in multiple
7979

8080
- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward.
8181
- If you want to ask questions on some code you've already written you can create a draft pull request, [detailed in a GitHub blog post][draft prs].
82-
- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"][contrib forum] forum. The team monitors that one closely, so one of us will be on hand and ready to point you in the right direction.
82+
- Unsure where to start? Did something not work as expected? Try leaving a note in the [forum][forum]. The team monitors that one closely, so one of us will be on hand and ready to point you in the right direction.
8383

8484

8585
<!-- Local -->
@@ -90,7 +90,7 @@ You can get in touch with [the core contributors team][core collabs] in multiple
9090

9191
[sync fork ext]: http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated "Details on keeping a git fork updated"
9292
[draft prs]: https://github.blog/2019-02-14-introducing-draft-pull-requests/ "Github's blog post providing details on draft pull requests"
93-
[contrib forum]: https://our.umbraco.com/forum/contributing-to-umbraco-cms/
93+
[forum]: https://forum.umbraco.com/
9494
[Umbraco CMS repo]: https://github.com/umbraco/Umbraco-CMS
9595
[up for grabs issues]: https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs
9696
[issue tracker]: https://github.com/umbraco/Umbraco-CMS/issues

‎src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Umbraco.Cms.Api.Management.Controllers.Help;
1313

14+
[Obsolete("This is no longer used and will be removed in v19")]
1415
[ApiVersion("1.0")]
1516
public class GetHelpController : HelpControllerBase
1617
{

‎src/Umbraco.Cms.Api.Management/Controllers/Help/HelpControllerBase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Umbraco.Cms.Api.Management.Controllers.Help;
55

6+
[Obsolete("This is no longer used and will be removed in v19")]
67
[VersionedApiBackOfficeRoute("help")]
78
[ApiExplorerSettings(GroupName = "Help")]
89
public abstract class HelpControllerBase : ManagementApiControllerBase

‎src/Umbraco.Cms.Api.Management/OpenApi.json‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -11898,94 +11898,6 @@
1189811898
]
1189911899
}
1190011900
},
11901-
"/umbraco/management/api/v1/help": {
11902-
"get": {
11903-
"tags": [
11904-
"Help"
11905-
],
11906-
"operationId": "GetHelp",
11907-
"parameters": [
11908-
{
11909-
"name": "section",
11910-
"in": "query",
11911-
"schema": {
11912-
"type": "string"
11913-
}
11914-
},
11915-
{
11916-
"name": "tree",
11917-
"in": "query",
11918-
"schema": {
11919-
"type": "string"
11920-
}
11921-
},
11922-
{
11923-
"name": "skip",
11924-
"in": "query",
11925-
"schema": {
11926-
"type": "integer",
11927-
"format": "int32",
11928-
"default": 0
11929-
}
11930-
},
11931-
{
11932-
"name": "take",
11933-
"in": "query",
11934-
"schema": {
11935-
"type": "integer",
11936-
"format": "int32",
11937-
"default": 100
11938-
}
11939-
},
11940-
{
11941-
"name": "baseUrl",
11942-
"in": "query",
11943-
"schema": {
11944-
"type": "string",
11945-
"default": "https://our.umbraco.com"
11946-
}
11947-
}
11948-
],
11949-
"responses": {
11950-
"400": {
11951-
"description": "Bad Request",
11952-
"content": {
11953-
"application/json": {
11954-
"schema": {
11955-
"oneOf": [
11956-
{
11957-
"$ref": "#/components/schemas/ProblemDetails"
11958-
}
11959-
]
11960-
}
11961-
}
11962-
}
11963-
},
11964-
"200": {
11965-
"description": "OK",
11966-
"content": {
11967-
"application/json": {
11968-
"schema": {
11969-
"oneOf": [
11970-
{
11971-
"$ref": "#/components/schemas/PagedHelpPageResponseModel"
11972-
}
11973-
]
11974-
}
11975-
}
11976-
}
11977-
},
11978-
"401": {
11979-
"description": "The resource is protected and requires an authentication token"
11980-
}
11981-
},
11982-
"security": [
11983-
{
11984-
"Backoffice-User": [ ]
11985-
}
11986-
]
11987-
}
11988-
},
1198911901
"/umbraco/management/api/v1/imaging/resize/urls": {
1199011902
"get": {
1199111903
"tags": [

‎src/Umbraco.Cms.Api.Management/ViewModels/Installer/UpgradeSettingsResponseModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ public class UpgradeSettingsResponseModel
1717
public string OldVersion { get; set; } = string.Empty;
1818

1919
public string ReportUrl =>
20-
$"https://our.umbraco.com/contribute/releases/compare?from={OldVersion}&to={NewVersion}&notes=1";
20+
$"https://releases.umbraco.com/compare?from={OldVersion}&to={NewVersion}&notes=1";
2121
}

‎src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
</div>
4444

4545
<div class="col">
46-
<h2>Be a part of the community</h2>
47-
<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
46+
<h2>The Umbraco community forum</h2>
47+
<p>The forum is the central hub for the Umbraco developer community. This is where developers, integrators, and contributors come together to ask questions, share knowledge, and collaborate on all things Umbraco.</p>
4848

49-
<a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank" rel="noopener">our.Umbraco &rarr;</a>
49+
<a href="https://forum.umbraco.com/" target="_blank" rel="noopener">Umbraco community forum &rarr;</a>
5050
</div>
5151
</div>
5252

‎src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NotFound.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
</div>
6363

6464
<div class="col">
65-
<h2>Be a part of the community</h2>
66-
<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
65+
<h2>The Umbraco community forum</h2>
66+
<p>The forum is the central hub for the Umbraco developer community. This is where developers, integrators, and contributors come together to ask questions, share knowledge, and collaborate on all things Umbraco.</p>
6767

68-
<a href="https://our.umbraco.com/" target="_blank" rel="noopener">our.Umbraco &rarr;</a>
68+
<a href="https://forum.umbraco.com/" target="_blank" rel="noopener">Umbraco community forum &rarr;</a>
6969
</div>
7070
</div>
7171

‎src/Umbraco.Core/Constants-PropertyEditors.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ public static class Aliases
9090
/// </summary>
9191
public const string DateOnly = "Umbraco.DateOnly";
9292

93+
/// <summary>
94+
/// Entity Data Picker
95+
/// </summary>
96+
public const string EntityDataPicker = "Umbraco.EntityDataPicker";
97+
9398
/// <summary>
9499
/// Time Only.
95100
/// </summary>

‎src/Umbraco.Core/Models/EntityDataPickerValue.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace Umbraco.Cms.Core.Models;
2+
3+
public sealed class EntityDataPickerValue
4+
{
5+
public required IEnumerable<string> Ids { get; set; }
6+
7+
public required string DataSource { get; set; }
8+
}

0 commit comments

Comments
 (0)