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

36213 Commits

Author SHA1 Message Date
Ronald Barendse
f1c83fbd80 Only select ItemIdFieldName in PublishedContentQuery.Search to improve performance (#11950) 
* Fix code styling

* Only select ItemIdFieldName and fix exception when variation context is null

* Save hashset instead of making on on each request (indirectly)

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2022-02-15 16:46:20 +01:00
Bjarke Berg
0f4020dc7b Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logo_large_blue.svg
#	src/Umbraco.Web.UI.Client/src/assets/img/application/umbraco_logomark_white.svg
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js
#	src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2022-02-15 14:10:17 +01:00
Bjarke Berg
62fa1695df Add config to hide backoffice logo (#11999) 
* Added config to hide backoffice logo

* rename to hideBackofficeLogo

* hide on mobile

* add hideBackofficeLogo

* implement hideBackofficeLogo + toggle on click

* Updated c# syntax

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
 2022-02-15 10:48:52 +01:00
Andy Butland
de2668a621 Added section for promoted packages in the back-office. (#11947) 
* Added section for promoted packages in the back-office.

* Updates from PR review.
 2022-02-14 17:41:12 +01:00
Paul Johnson
cf410ab91e Attempt to make app local icu setup less problematic. (#11961) 
* Attempt to make app local icu setup less problematic.

Prevents issues for windows build agent -> linux app server.

On Windows version is split at first '.' e.g. 68.2.0.9 ->  icuuc68.dll
https://github.com/dotnet/runtime/blob/205f70e/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Windows.cs

On Linux we are looking for libicuuc.so.68.2.0.9
https://github.com/dotnet/runtime/blob/205f70e/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Unix.cs

On macos we don't have a native library in a shiny nuget package so hope
folks are building on their macs or setting the rid until we have a
better solution.

* Combine elements
 2022-02-10 12:03:35 +00:00
nikolajlauridsen
b63aa4b19c Merge remote-tracking branch 'origin/v9/9.3' into v9/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
 2022-02-09 13:31:49 +01:00
nikolajlauridsen
eea02137ae Bump version to non-rc 2022-02-09 10:26:31 +01:00
Bjarke Berg
3d28552a77 Add settings to bypass 2fa for external logins (#11959) 
* Added settings for bypassing 2fa for external logins

* Fixed issue with saving roles using member ID before the member had an ID.

* Added missing extension method

* Removed test classes from git

* rollback csproj
 2022-02-09 10:19:39 +01:00
Niels Lyngsø
b89cd86d85 Apply the Umbraco logo to BackOffice (#11949) 
* adding logo as text in replacement of umbraco_logo_white, this will enable existing configuration to continue to work and minimise the breaking change of this PR.

* adjust logo position to fit with logged-in logomark. Allowing for the logo and customised logo to be very wide.

* adding logomark in topbar of backoffice

* login box style

* correction of shadow

* Logo modal, to display more information about the product including linking to the website

* rename to modal

* stop hidden when mouse is out

* Version line without Umbraco

* focus link and use blur as the indication for closing.

* correcting to rgba

* focus and click outside needs a little help to work well

* use @zindexUmbOverlay to ensure right depth going forward.

* adding large logo svg

* append ;

* tidy logo svg file
 2022-02-08 10:40:14 +01:00
Niels Lyngsø
0b0182f550 Apply the Umbraco logo to BackOffice (#11949) 
* adding logo as text in replacement of umbraco_logo_white, this will enable existing configuration to continue to work and minimise the breaking change of this PR.

* adjust logo position to fit with logged-in logomark. Allowing for the logo and customised logo to be very wide.

* adding logomark in topbar of backoffice

* login box style

* correction of shadow

* Logo modal, to display more information about the product including linking to the website

* rename to modal

* stop hidden when mouse is out

* Version line without Umbraco

* focus link and use blur as the indication for closing.

* correcting to rgba

* focus and click outside needs a little help to work well

* use @zindexUmbOverlay to ensure right depth going forward.

* adding large logo svg

* append ;

* tidy logo svg file
 2022-02-08 10:35:06 +01:00
Bjarke Berg
23803a44b7 Fixed minor issues and added xml docs (#11943) 2022-02-07 14:32:58 +01:00
Mole
d7fef7cd0c Check blockObject.content for null 2022-02-07 12:09:13 +01:00
Bjarke Berg
58b75c58aa Fixes issue with miniprofiler losing the information when doing a redirect, e.g. in a successful surfacecontroller call. (#11939) 
Now we store the profiler in a cookie on local redirects and pick it up on next request and add it as a child to that profiler
 2022-02-07 09:21:26 +01:00
Bjarke Berg
158f4d29f6 Bump version to 9.4.0-rc 2022-02-04 13:02:19 +01:00
Bjarke Berg
139c5791a5 Merge pull request #11926 from umbraco/v9/bugfix/replicas-write-to-server-table 
Don't write to server table if not using ElectedServerRoleAccessor
 2022-02-01 14:53:37 +01:00
Bjarke Berg
27ef97bf34 Merge pull request #11924 from umbraco/v9/feature/override-sitename-from-config 
Allow setting the site name from appsettings
 2022-02-01 14:38:39 +01:00
Bjarke Berg
d6f968eee4 Merge pull request #11874 from umbraco/v9/feature/play-nice-with-ServiceBasedControllerActivator 
Prevent issues for those who wish use ServiceBasedControllerActivator.
 2022-02-01 14:34:37 +01:00
Sebastiaan Janssen
a6ce7bcdf6 Merge branch 'v8/dev' into v8/8.18 2022-02-01 11:36:26 +01:00
Sebastiaan Janssen
0200434227 Merge branch 'v8/contrib' into v8/dev 2022-02-01 11:09:02 +01:00
Kenn Jacobsen
9a5bcf290d Retain mculture when clicking results from global search (#7192) 2022-02-01 01:50:22 +01:00
Sebastiaan Janssen
ec183e481c Bump version to 8.18.0-rc 2022-01-31 15:47:51 +01:00
Sebastiaan Janssen
924a819baa Upgrade ClientDependency to 1.9.10 2022-01-31 15:39:34 +01:00
Mole
3af6645ad8 Fix URL with culture (#11886) 
* Ignore casing when comparing default culture

* Ignore casing in GetAssignedWithCulture

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2022-01-31 15:02:25 +01:00
Mole
824bc2ac28 Fix word salad in comment 2022-01-31 14:58:45 +01:00
Mole
22dd3a214c Stop TouchServerTask is registered role accessor is not elected 2022-01-31 14:39:29 +01:00
Sebastiaan Janssen
4382868f82 Upgrade Examine to v1.2.2 2022-01-31 14:18:55 +01:00
Sebastiaan Janssen
5c019a1557 Merge branch 'v8/contrib' into v8/dev 2022-01-31 14:15:03 +01:00
Mole
bdcb5d859e Get site name from appsettings if possible 2022-01-31 10:12:02 +01:00
Paul Johnson
1810cec80a Simplify registration for ambiguous ctor 
ActivatorUtilitiesConstructor respected.
 2022-01-31 08:39:33 +00:00
Bjarne Fyrstenborg
472cc716c4 Accept zip as extension in local package installer (#11109) 
* Update ngf-pattern and accept

* Restructure less

* Remove ng-invalid again
 2022-01-31 02:40:15 +01:00
andreymkarandashov
3167c8b213 encode group name to avoid the issue 2022-01-31 01:35:03 +01:00
Mole
c0dfb33916 Fix importing DocType if parent folder already exists (#11885) 
* Don't try to create parent folder if it already exists

* Fix typo

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2022-01-28 12:30:44 +01:00
Lennard Fonteijn
477697a70c Removed if-check to allow empty values from blocks 2022-01-28 03:43:53 +01:00
Bjarke Berg
a71529a058 V9/feature/merge v8 27012022 (#11915) 
* Add allowlist for HelpPage

* Use current request for emails (#11775)

* Use current request for emails

* Fix tests

* Bump version to 8.17.2

* Use Umbraco Path instead of constant

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2022-01-27 17:37:32 +01:00
Bjarke Berg
8c822c59ac Merge remote-tracking branch 'origin/v8/8.17' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
 2022-01-27 16:04:50 +01:00
Bjarke Berg
c79380191b Use Umbraco Path instead of constant 2022-01-27 15:57:22 +01:00
Bjarke Berg
a779803763 Bump version to 8.17.2 2022-01-27 13:18:21 +01:00
Mole
1b98f8985e Use current request for emails (#11775) 
* Use current request for emails

* Fix tests
 2022-01-27 12:59:45 +01:00
Bjarke Berg
7971f36b78 Add check for PluginControllerAttribute and compare area name (#11911) 
* Add check for PluginControllerAttribute and compare area name

* Added null check
 2022-01-27 10:32:56 +01:00
Mole
c73d0bf6a6 Update logging message in HelpController 2022-01-27 09:53:16 +01:00
Mole
de6824dfa0 Merge pull request #11909 from umbraco/v9/feature/allowlist-for-help-page 
V9: Add allowlist for HelpPage
 2022-01-26 13:25:45 +01:00
Bjarke Berg
d4c43b69f7 Updated to use IOptionsMonitor 2022-01-26 12:40:14 +01:00
Ronald Barendse
4d4aff4c67 Apply changes from #11805 and #11806 to v9 (#11904) 
* Apply changes from #11805 and #11806 to v9

* Update documentation and cleanup code styling
 2022-01-26 12:22:05 +01:00
Mole
3261a6f71d Fix up for V9 2022-01-26 12:12:59 +01:00
Mole
2f17d766be Cherry pick Add allowlist for HelpPage 2022-01-26 11:43:59 +01:00
Mole
9dbe2d211c Add allowlist for HelpPage 2022-01-26 10:57:49 +01:00
Mole
72533d29c8 Specify namespace for CharITem 2022-01-26 10:20:12 +01:00
Mole
2ddb3e13e5 Fix breaking changes 2022-01-26 10:05:01 +01:00
Mole
3ade2b6de3 Add RC to version 2022-01-26 08:43:43 +01:00
Bjarke Berg
930bdac45e Merge remote-tracking branch 'origin/v9/feature/add-html-sanitizer-abstraction' into v9/dev 
# Conflicts:
#	src/Umbraco.Core/Security/IHtmlSanitizer.cs
#	src/Umbraco.Core/Security/NoopHtmlSanitizer.cs
 2022-01-26 08:02:04 +01:00