yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,654 Commits 4 Branches 7 Tags
d368bd3ebf0bd868e5fbda2d782e32e9020b9c45
Commit Graph

44654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lyngsø
d368bd3ebf Update import maps (#15446) 
* append 'property' and 'static-file'

* latest front-end commit
 2023-12-14 11:45:44 +01:00
Mole
db9dc4a20d Rename user controller files to match class names (#15442) 2023-12-14 10:36:43 +01:00
Bjarke Berg
93fe9f3dea build 2023-12-14 09:04:23 +01:00
Bjarke Berg
baf29649c9 Move package to central 2023-12-14 08:42:20 +01:00
Bjarke Berg
d1b53c0ec9 Added ignore on new tests (Temporarily) 2023-12-13 16:34:17 +01:00
Bjarke Berg
f8dda5a7b5 Post merge fixes 2023-12-13 16:25:28 +01:00
Bjarke Berg
95094361cc Merge remote-tracking branch 'origin/v13/dev' into v14/dev 
# Conflicts:
#	Directory.Packages.props
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListEditorDataConverter.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListPropertyEditorBase.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueCreator.cs
#	tests/Directory.Packages.props
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	version.json
 2023-12-13 15:34:22 +01:00
Nhu Dinh
ced1a82c4e Renamed GetRichTextRulesByPath controller (#15443) 2023-12-13 10:58:56 +01:00
Bjarke Berg
38879e11df Merge remote-tracking branch 'origin/release/13.0' into v13/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/CreatedPackageSchemaRepository.cs
#	version.json
 2023-12-13 10:44:10 +01:00
Bjarke Berg
8a9e6ee82d Merge remote-tracking branch 'origin/v12/dev' into v13/dev 
# Conflicts:
#	global.json
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html
#	src/Umbraco.Core/EmbeddedResources/Lang/da.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/fr.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
#	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
#	src/Umbraco.Infrastructure/BackgroundJobs/RecurringBackgroundJobHostedServiceRunner.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
#	src/Umbraco.Web.UI/Startup.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs
#	version.json
 2023-12-13 09:55:34 +01:00
Sven Geusens
7fdd342643 PropertyEditor(UI)Alias name refactor (#15408) 
* PropertyEditor(UI)Alias name refactor

* Updated OpenApi.json

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2023-12-13 09:50:52 +01:00
Bjarke Berg
bd3a26801d Merge remote-tracking branch 'origin/v11/dev' into v12/dev 2023-12-13 09:36:55 +01:00
Bjarke Berg
5a4aaae7f2 Merge remote-tracking branch 'origin/release/12.3' into v12/dev 
# Conflicts:
#	version.json
 2023-12-13 09:36:44 +01:00
Bjarke Berg
4e12f1e4e6 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-13 09:36:25 +01:00
Bjarke Berg
923c98a29f Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/LanguageController.cs
 2023-12-13 09:31:54 +01:00
Bjarke Berg
8915064780 Merge remote-tracking branch 'origin/release/10.8' into v10/dev 
# Conflicts:
#	version.json
 2023-12-13 09:28:19 +01:00
Bjarke Berg
9dfb3005bc fix build 2023-12-12 17:00:30 +01:00
Bjarke Berg
c2c1285d17 Fix json schema 2023-12-12 15:56:54 +01:00
Nikolaj Geisle
3720b5d930 Merge pull request from GHSA-v98m-398x-269r 
Co-authored-by: kjac <kja@umbraco.dk>
 2023-12-12 15:56:44 +01:00
Nikolaj Geisle
d0c5372c6b Merge pull request from GHSA-cfr5-7p54-4qg8 
* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-12 15:56:44 +01:00
Nikolaj Geisle
f7e4832898 Merge pull request from GHSA-8qp8-9rpw-j46c 
* Ensure that missing access rules do not break the site (#15081)

(cherry picked from commit 6777145079)

* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
 2023-12-12 15:56:31 +01:00
Nikolaj Geisle
b3caf747df Merge pull request from GHSA-6324-52pr-h4p5 
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-12 15:56:13 +01:00
Zeegaan
497927303f Suppress flow when queueing background threads 2023-12-12 15:55:05 +01:00
Zeegaan
13079eb667 Loosen up policies so editors can get what they need 2023-12-12 15:50:09 +01:00
Zeegaan
73fab105d2 Loosen up policies so editors can get what they need 2023-12-12 15:48:37 +01:00
Bjarke Berg
0c355b0cf1 Bump version 2023-12-12 15:47:43 +01:00
Bjarke Berg
0ed0338d8f Merge remote-tracking branch 'origin/release/12.3.4' into release/12.3 2023-12-12 15:47:28 +01:00
Zeegaan
677ff59d04 Loosen up policies so editors can get what they need 2023-12-12 15:46:46 +01:00
Bjarke Berg
1fe2ec08be bump version 2023-12-12 15:35:15 +01:00
Jacob Overgaard
6f123224de V13: Regression with global window.uui export (#15412) 
* revert change to load commonjs version of uui

* revert to load uui

* build login first

* build login assets as iife to support loading inside the backoffice
 2023-12-12 12:03:49 +01:00
Zeegaan
e37e2b5973 bump version 2023-12-12 11:20:44 +01:00
Kenn Jacobsen
fa0b8c7b4d Ensure thread safety for block editor constructor caches (#15425) 2023-12-12 09:55:56 +01:00
Bjarke Berg
fe6d6f7156 Post fix 2023-12-11 16:43:21 +01:00
Bjarke Berg
4a0d364d10 Post fix 2023-12-11 16:33:56 +01:00
Bjarke Berg
5dfa76600a Post fix 2023-12-11 16:32:38 +01:00
Jacob Overgaard
81b23a60a4 update backoffice submodule 2023-12-11 16:05:26 +01:00
Bjarke Berg
4b78fabd54 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/login.controller.js
 2023-12-11 14:41:17 +01:00
Bjarke Berg
bab22d8b5f Merge remote-tracking branch 'origin/release/12.3.4' into release/13.0 
# Conflicts:
#	version.json
 2023-12-11 14:39:32 +01:00
Bjarke Berg
9f375ede65 Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev 2023-12-11 14:37:36 +01:00
Bjarke Berg
83bcd37250 Merge remote-tracking branch 'origin/release/10.8' into v10/dev 2023-12-11 14:37:10 +01:00
Nikolaj Geisle
237e4e56b2 Merge pull request from GHSA-v98m-398x-269r 
Co-authored-by: kjac <kja@umbraco.dk>
 2023-12-11 14:00:23 +01:00
Kenn Jacobsen
4a7ad4a562 Merge pull request from GHSA-v98m-398x-269r 2023-12-11 14:00:23 +01:00
Nikolaj Geisle
42ae37e502 Merge pull request from GHSA-cfr5-7p54-4qg8 
* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

---------

Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:59 +01:00
Nikolaj Geisle
cdd4d2a000 Merge pull request from GHSA-cfr5-7p54-4qg8 
* Bump version

* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

* Apply authorization policies to controllers

* Return bad request if we urltracking is disabled

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:59 +01:00
Nikolaj Geisle
3331788c5c Merge pull request from GHSA-8qp8-9rpw-j46c 
* Ensure that missing access rules do not break the site (#15081)

(cherry picked from commit 6777145079)

* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
 2023-12-11 13:59:35 +01:00
Nikolaj Geisle
be5a740c96 Merge pull request from GHSA-8qp8-9rpw-j46c 
* Added Exception handling and replicated error and info message

* Update auth.resource.js

Fixed the message

* Changed Delay introduction to early phase to avoid repeating code.

---------

Co-authored-by: jey <jey@umbraco.dk>
Co-authored-by: Jey <cyaqublu@gmail.com>
 2023-12-11 13:59:35 +01:00
Nikolaj Geisle
50a107f885 Merge pull request from GHSA-6324-52pr-h4p5 
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:03 +01:00
Nikolaj Geisle
13cc320f19 Merge pull request from GHSA-6324-52pr-h4p5 
* Bump version

* Fix https://github.com/umbraco/Umbraco-CMS/security/advisories/GHSA-6324-52pr-h4p5

* Fix https://github.com/umbraco/Umbraco-CMS/security/advisories/GHSA-6324-52pr-h4p5

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-12-11 13:59:03 +01:00
Zeegaan
3a697d90fc Suppress flow when queueing background threads 2023-12-11 12:44:06 +01:00
Zeegaan
b5544aa520 Suppress flow when queueing background threads 2023-12-11 12:43:25 +01:00