yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,762 Commits 4 Branches 7 Tags
6a8f8a48edaf673d6c02cf77d7015d3a67ca1381
Commit Graph

43762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
justinbotger
9e168f6502 Updated Dutch translation for "import" 
Updated Dutch translation for "import"
 2023-10-06 10:44:44 +02:00
dependabot[bot]
961f6a0bab Bump postcss from 8.4.24 to 8.4.31 in /src/Umbraco.Web.UI.Client (#14920) 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.24 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.24...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-10-05 15:41:17 +02:00
Kenn Jacobsen
04b05714e5 Add notification state to "final" published notification when publishing with descendants (#14922) 
* Revert "V10/bugfix/14543 publish descendants (#14763)"

This reverts commit f750bca453.

* Add notification state to "final" published notification when publishing with descendants
 2023-10-05 14:39:00 +02:00
thomashdk
ced8e0582d Update umb-tabs-nav.html 
Added data-element="tab-{{tab.alias}}" to the dropdown tabs list
 2023-10-03 19:29:56 +02:00
Laura Neto
44a4abdfbd Updating contributing docs to add unwanted changes section (#14853) 
* Updating contributing docs to add unwanted changes section

* Added new section to table of contents
 2023-10-03 17:44:10 +01:00
Paul Seal
1cac8ffe88 made link to umbraco learning base youtube visible with underline sty… (#14884) 
* made link to umbraco learning base youtube visible with underline style as per the other links on other dashboards.

* Update membersdashboardvideos.html

---------

Co-authored-by: Georgina Bidder <georgina.bidder@truedigital.co.uk>
Co-authored-by: georgebid <91198628+georgebid@users.noreply.github.com>
 2023-10-03 17:42:29 +01:00
Bjarne Fyrstenborg
34892101a9 Ensure focus on specific action in block card (#14846) 
* Ensure focus on specific action in block card

* Move if statement to parent

* Change buttons in groups as well

* Adjust styling
 2023-10-03 17:02:20 +01:00
Erik-Jan Westendorp
930f9f6704 Translate dictionary_noItemsFound 2023-10-03 16:19:59 +02:00
Anders Bjerner
4932119807 Replaced [MaybeNullWhen(false)] with [NotNullWhen(true)] for UdiParser.TryParse method (#14880) 
* Replaced [MaybeNullWhen(false)] with [NotNullWhen(true)] for UdiParser.TryParse method

* Removing some empty lines
 2023-10-03 14:43:54 +02:00
Kenn Jacobsen
7be1852827 Make sure to sign out external users if an error occurs during sign-in (#14867) 2023-09-28 13:25:11 +02:00