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

44199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kjac
e30a87d1fd Merge branch 'v13/dev' into v14/dev 
# Conflicts:
#	Directory.Build.props
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs
#	src/Umbraco.Cms.Api.Common/OpenApi/SwaggerRouteTemplatePipelineFilter.cs
#	src/Umbraco.Cms.Api.Common/Security/Paths.cs
#	src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs
#	src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Cms.Api.Delivery/Handlers/InitializeMemberApplicationNotificationHandler.cs
#	src/Umbraco.Cms.Api.Delivery/Handlers/RevokeMemberAuthenticationTokensNotificationHandler.cs
#	src/Umbraco.Cms.Api.Delivery/Security/MemberApplicationManager.cs
#	src/Umbraco.Cms.Api.Delivery/Services/RequestMemberAccessService.cs
#	src/Umbraco.Core/Constants-OAuthClaims.cs
#	src/Umbraco.Core/Constants-OAuthClientIds.cs
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryProvider.cs
#	src/Umbraco.Core/DeliveryApi/IApiContentQueryService.cs
#	src/Umbraco.Core/DeliveryApi/IRequestMemberAccessService.cs
#	src/Umbraco.Core/DeliveryApi/NoopRequestMemberAccessService.cs
#	src/Umbraco.Core/Models/DeliveryApi/ProtectedAccess.cs
#	src/Umbraco.Core/Services/ITagService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Infrastructure/Security/IMemberApplicationManager.cs
#	src/Umbraco.Infrastructure/Security/OpenIdDictApplicationManagerBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts
#	version.json
 2023-10-23 19:03:13 +02:00
kjac
6a8f8a48ed Fixed merge conflicts and ensured same version of OpenIddict abstractions across the solution 2023-10-22 11:48:27 +02:00
kjac
3169ff9581 Merge branch 'v12/dev' into v13/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
#	version.json
 2023-10-22 11:23:04 +02:00
Ronald Barendse
2c572c6f72 Only pack transformed template.json file 
When building and packaging at the same time, the original template.json file was still included in the generated NuGet package, which resulted in duplicate files with the same name. This change explicitly disables packaging the original file, ensuring only the transformed template.json file (containing the current Umbraco version) is included.
 2023-10-19 10:49:10 +02:00
Ronald Barendse
0c7f9ec64f Fix unrecognized value stageDependencies in jobs 2023-10-18 14:58:44 +02:00
Ronald Barendse
eac6af6878 Use correct stage to stage condition dependencies 2023-10-18 14:52:08 +02:00
Kenn Jacobsen
684508643f Ensure additional preview URLs work on non-variant content (#14995) 2023-10-18 10:45:16 +02:00
Jacob Overgaard
4a63788079 V12: Update Backoffice dependencies: jQuery, TinyMCE, SignalR, Ace Editor, Umbraco UI Library (#14994) 
* bump @microsoft/signalr to 7.0.12

* bump @umbraco-ui/uui to 1.4.0

* bump ace editor to 1.30.0

* bump frontend build dependencies

* bump jquery to 3.7.1

* bump tinymce to 6.7.0

* bump frontend test suite tools
 2023-10-18 10:44:06 +02:00
Sebastiaan Janssen
9c1abf23b0 Merge branch 'contrib' into v12/dev 2023-10-17 13:27:10 +02:00
Lucas Bach Bisgaard
738749b705 Fixes #14351 - Using Fallback to default langauge on a specific item changes the whole VariationContext (#14620) 2023-10-17 13:24:24 +02:00
Elitsa Marinovska
b0ca3444f4 V13: Add config to limit concurrent logins (#14989) 
* Add config to limit concurrent logins (#14967)

* Add new config options

* Change validation interval + related changes

* Fix typo

* Temp fix

* Set new setting to false for new dotnet projects

* Added logic to update security stamp on sign in + fixed wierd code calling handle signIn twice

* Cleanup

* Adding empty ctors

---------

Co-authored-by: Elitsa <elm@umbraco.dk>

* Set default setting to false + remove it from templates

---------

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2023-10-17 12:58:02 +02:00
Bjarke Berg
0a8b12793e Add config to limit concurrent logins (#14967) 
* Add new config options

* Change validation interval + related changes

* Fix typo

* Temp fix

* Set new setting to false for new dotnet projects

* Added logic to update security stamp on sign in + fixed wierd code calling handle signIn twice

* Cleanup

* Adding empty ctors

---------

Co-authored-by: Elitsa <elm@umbraco.dk>
 2023-10-17 10:23:52 +02:00
Kenn Jacobsen
ea4f07bd08 Create matcher policy to pick the correct item endpoint (#14987) 2023-10-17 08:55:09 +02:00
Lucas Bach Bisgaard
7cf1ad7592 add Audit Trail to the media info tab just alike the conten (#14781) 
* add Audit Trail to the media info tab just alike the conten

* Change the tranlation from "content ..." to "Media ..."

---------

Co-authored-by: Lucas Bach Bisgaard <lom@novicell.dk>
 2023-10-16 16:55:30 +01:00
Sebastiaan Janssen
13913cd9fb Merge branch 'v12/dev' into contrib 
# Conflicts:
#	version.json
 2023-10-16 12:53:07 +02:00
Kenn Jacobsen
4bd9baa2eb Backport Delivery API member auth from V14 (#14964) 
* Backport Delivery API member auth from V14

* Add default implementations to avoid breakage

* Review changes
 2023-10-16 11:25:29 +02:00
Jannik Anker
4520fbe5b8 Out-of-date models status flag is created when using SourceCodeManual and Development Runtime (#14966) 
* Update UmbracoBuilderDependencyInjectionExtensions.cs

* Remove duplicate OutOfDateModelStatus handlers

---------

Co-authored-by: Ronald Barendse <ronald@barend.se>
 2023-10-16 10:46:58 +02:00
Owain Jones
1b3642e7f3 Updated Welsh lang file (#14978) 
* Added missing Welsh translations

* added missing mfa en_us keys

* Removed outdated lang keys from the cy lang file

* Fixed some instances of &lt;/&gt; to use actual angle brackets in the cy lang file.
 2023-10-15 01:09:09 +02:00
Ambert van Unen
0b5d1f8aa6 Fix for fallback file upload (#14892) 
* Added check for file type

* Removed unneeded null checks and fixed tabs

* Cleaning

* Cleanups, cleanups, and removal of unneeded null checks

* Reverted removal of relationshipservice

* Revert null check removals (too risky)

---------

Co-authored-by: Ambert van Unen <AvanUnen@ilionx.com>
Co-authored-by: Laura Neto <12862535+lauraneto@users.noreply.github.com>
 2023-10-14 17:13:26 +02:00
Georgina Bidder
8b1191c332 help links tests + clean up of system info 2023-10-14 16:04:15 +02:00
Bjarne Fyrstenborg
70d36301ab Remove duplicate name attribute in 2FA login form 2023-10-14 10:56:34 +01:00
Bram Hoven
b8928e9de0 Add IExceptionHandlerFeature check to dynamic route check (#14905) 
* Add IExceptionHandlerFeature check to dynamic route check

* Decrease code complexity
 2023-10-14 02:01:59 +02:00
Erik-Jan Westendorp
73fc6bdcdf a11y improvement 2023-10-13 13:47:53 +01:00
Callum Whyte
b850cd3ee0 Add SetMemberSignInManager builder extension (#14761) 
* Add SetMemberSignInManager builder extension

* Added required using statement

---------

Co-authored-by: Emma Garland <emma.garland@rocksolidknowledge.com>
 2023-10-13 12:30:13 +01:00
Lucas Bach Bisgaard
0ece94bf46 Bug fix whre mediapicker dont load before an event fires elsewhere #14250 (#14803) 2023-10-13 10:34:45 +01:00
Andreas Zerbst
ace8d80183 Refactored from ISystemClock to TimeProvider (#14963) 
* Removed obsolete ISystemClock. The SecurityStampValidator provides the TimeProvider.

* Removed obsolete ISystemClock.

* Refactored obsolete ISystemClock with TimeProvider
 2023-10-12 13:58:51 +02:00
Sven Geusens
6fb2550690 V14/feature/response model trash tracking (#14948) 
* Clearify UmbracoMapper functionality trough comment

* Add trash tracking to doc/media(item) response models

* Add mapping for ITracksTrashing

* Removed uneccesary abstraction and seperation

* Cleanup after removing abstractions

* Cleanup unused DI item

* Clean up and formatting

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: kjac <kja@umbraco.dk>
 2023-10-12 07:00:06 +02:00
Michael
0362dcffc8 Remove submodule 2023-10-12 03:21:53 +02:00
KNOWIT\anndal3
612b6039f2 Add aria label to umbraco property 2023-10-12 02:22:21 +02:00
Elitsa Marinovska
517e0e9d19 Removing dev certificates and adding enc and signing keys that are required by OpenIddict but won't be used when we calling UseDataProtection() (#14958) 2023-10-11 14:15:08 +02:00
Ronald Barendse
b6f0db7b73 Fix build logging of warnings/errors during packaging step (#14933) 
* Use DotNetCoreCLI for dotnet pack command

* Use NBGV to get major version and set build number

* Use NBGV_PublicRelease to determine stable build

* Use latest Node patch versions

* Generate NuGet packages during build
 2023-10-11 11:25:05 +02:00
Nikolaj Geisle
443f03688e Fix update to update foreach Group (#14945) 2023-10-11 10:46:25 +02:00
Mads Rasmussen
332ef6fa7e align user import map (#14952) 2023-10-11 10:01:22 +02:00
Bjarke Berg
838fd95f41 Merge remote-tracking branch 'origin/v13/dev' into v14/dev 
# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorAdvanced.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorAreasContent.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorSettings.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Datatype/BlockGridEditorDataTypeBlocks.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts
 2023-10-10 13:47:18 +02:00
Bjarke Berg
42bc50eccf Merge remote-tracking branch 'origin/v12/dev' into v13/dev 2023-10-10 13:44:46 +02:00
Bjarke Berg
0844cb8b29 Merge remote-tracking branch 'origin/v11/dev' into v12/dev 
# Conflicts:
#	src/Umbraco.Core/Services/ContentService.cs
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorAdvanced.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorAreasContent.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Content/blockGridEditorSettings.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockGridEditor/Datatype/BlockGridEditorDataTypeBlocks.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts
 2023-10-10 12:49:22 +02:00
Bjarke Berg
e6a1640c1b Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts
 2023-10-10 12:27:33 +02:00
Bjarke Berg
41f8f03c2c Fixed a couple of occurrences where scopes was auto-completed while modified db state (#14947) 
* Fixed a couple of occurrences where scopes was auto-complated while actually modified the state of the database.

* Added temp ctor to fix boot issue
 2023-10-10 11:51:47 +02:00
Jacob Overgaard
7995df6cfd update backoffice submodule 2023-10-09 17:33:53 +02:00
Mads Rasmussen
99a1aa9301 update event path in importmap (#14844) 2023-10-09 16:15:40 +02:00
Elitsa Marinovska
132935c2d7 Handle corrupted index (#14889) 2023-10-09 10:19:36 +02:00
Richard Ockerby
6e154e0a0f Corrected mark-up 
An extra closing div tag was lurking around
 2023-10-09 08:48:15 +01:00
Vitor Rodrigues
39492f9654 Fixed URL tracking not working for invariant pages with culture variant ancestors 2023-10-06 18:30:02 +02:00
Erik-Jan Westendorp
6e937692be Update MemberService.cs 2023-10-06 13:54:48 +01:00
Erik-Jan Westendorp
7aa246b855 Update MediaController 2023-10-06 13:46:07 +01:00
James
cd2855634e Update umbBlockGridPropertyEditor.component.js 
currently checks the first group or tab (index 0) that was added to see if there are properties.

This doesn't work well when the tab has a single group, and the group is created after the tab, as the tab will be empty, even though the group has the properties. 

there is also some interactions when composing tabs from other doc types, but I didn't have a good amount of time to test this.
 2023-10-06 13:22:29 +01:00
Bjarne Fyrstenborg
46b0833d52 Pass in format parameter 2023-10-06 12:13:22 +01:00
Bjarne Fyrstenborg
d3ceeb0ace Update keywords 2023-10-06 12:13:22 +01:00
Bjarne Fyrstenborg
b917d64eec Allow to specify format and parsing format in dateHelper functions 2023-10-06 12:13:22 +01:00
Jacob Overgaard
5b57234b52 update backoffice submodule 2023-10-06 12:04:21 +02:00