yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,088 Commits 4 Branches 7 Tags
029aecccb5c6e791cd7ecbbc2a16b2b5c6457e4d
Commit Graph

41088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolaj Geisle
029aecccb5 update package-lock.json 2022-03-01 08:11:56 +01:00
Nikolaj Geisle
91a0e670bb update cypress package 2022-02-28 15:43:51 +01:00
Nikolaj Geisle
e32ddcd26f Remove SQLCE from sln file 2022-02-24 11:23:32 +01:00
Nikolaj Geisle
57f32100cb Fix errors 2022-02-21 12:49:17 +01:00
Bjarke Berg
cb44dc70f3 Rollback issues with signatures 2022-02-21 10:06:57 +01:00
Nikolaj Geisle
cb3e7706a8 Dont change cs proj to Warning as errors 2022-02-16 16:04:25 +01:00
Nikolaj Geisle
6be2cd45db Use nullability on the rest of core 2022-02-16 16:03:53 +01:00
Nikolaj Geisle
093d336cc7 Fix more nullability errors 2022-02-15 15:48:41 +01:00
Nikolaj Geisle
13b9816ba8 Remove outcommented WarningAsError 2022-02-15 14:42:01 +01:00
Nikolaj Geisle
945b115067 Fix more nullability errors 2022-02-15 14:41:06 +01:00
Nikolaj Geisle
793f8f0de2 Fix error after merge 2022-02-15 09:40:01 +01:00
Nikolaj Geisle
224341a533 Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco-Core 
# Conflicts:
#	src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
#	src/Umbraco.Core/Events/DeleteEventArgs.cs
#	src/Umbraco.Core/Events/IEventDispatcher.cs
#	src/Umbraco.Core/Events/PassThroughEventDispatcher.cs
#	src/Umbraco.Core/Events/QueuingEventDispatcherBase.cs
#	src/Umbraco.Core/IO/MediaFileManager.cs
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
 2022-02-15 09:29:58 +01:00
Nikolaj Geisle
e5dab9d044 uncomment code again 2022-02-15 08:48:18 +01:00
Paul Johnson
548870d59d Fix whitespace in sln 
(cherry picked from commit a34e278a40)
 2022-02-14 14:47:07 +00:00
Paul Johnson
d4dca18cbe Change web projects TargetFrameworkMoniker to 4.5.2 to stop VS 2022 err 
(cherry picked from commit 461043bd82)
 2022-02-14 14:44:40 +00:00
Nikolaj Geisle
ff58531aa5 Fix more acceptance tests 2022-02-14 15:00:22 +01:00
Nikolaj Geisle
8991256306 Fix some of the cypress tests 2022-02-14 12:57:59 +01:00
Bjarke Berg
a228f4e941 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
 2022-02-13 13:39:13 +01:00
Bjarke Berg
8b190e05c2 Merge pull request #11983 from umbraco/v10/feature/fix-for-UmbracoTestServerTestBase 
Fix issue running UmbracoTestServerTestBase tests with debugger attached
 2022-02-13 13:32:56 +01:00
Paul Johnson
a1e562cab6 Switch ConfigureServices back to protected. 
Downstream users may wish to subclass and add their application specific
services.
 2022-02-12 11:57:28 +00:00
Paul Johnson
fcd4ad17bb Make webhost setup less confusing. 2022-02-12 11:41:59 +00:00
Paul Johnson
1764440b35 Switch a lot of warnings to suggestions until we are able to resolve. (#11974) 
* Switch a lot of warnings to suggestions until we are able to resolve.

* Make stylecop respect more csharp_style rules

e.g. csharp_using_directive_placement

* Added cheatsheet

* Drop sorting requirements for using directives.

(cherry picked from commit 91c4c77676)
 2022-02-11 21:27:53 +00:00
Paul Johnson
c1fddd98be Additional refactoring I have been meaning to get around to for a while. 2022-02-11 20:39:57 +00:00
Paul Johnson
76cda7fd0c Fix issue running UmbracoTestServerTestBase tests with debugger attached 
Ensure ConfigureWebServer called before ConfigureServices for tests that
make use of WebApplicationFactory.

Still not apparent why tests would pass if debugger isn't attached?
 2022-02-11 16:52:57 +00:00
Paul Johnson
91c4c77676 Switch a lot of warnings to suggestions until we are able to resolve. (#11974) 
* Switch a lot of warnings to suggestions until we are able to resolve.

* Make stylecop respect more csharp_style rules

e.g. csharp_using_directive_placement

* Added cheatsheet

* Drop sorting requirements for using directives.
 2022-02-11 16:24:53 +00:00
Nikolaj Geisle
58f6226942 Fix Unit & Integration tests 2022-02-11 14:27:04 +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
Nikolaj Geisle
83baba696c Fixed build errors after turning nullability errors off 2022-02-10 10:32:45 +01: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
Nikolaj Geisle
b75eae01f3 Add nullability to core project 2022-02-09 13:24:35 +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
Mole
927ee44efe Merge pull request #11953 from umbraco/v9/feature/migrate-umbraco-logo 
Cherry pick Apply the Umbraco logo to BackOffice (#11949) to V9
 2022-02-08 11:52:18 +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
Bjarke Berg
23803a44b7 Fixed minor issues and added xml docs (#11943) 2022-02-07 14:32:58 +01:00
Bjarke Berg
25c52d507a Merge pull request #11944 from umbraco/v9/hotfix/remove-element-from-blocklist 
V9: Fix removing element from BlockList
 2022-02-07 14:13:38 +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
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
febdac5713 Fix tests 2022-01-31 14:46:25 +01:00
Mole
22dd3a214c Stop TouchServerTask is registered role accessor is not elected 2022-01-31 14:39:29 +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
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
Bjarke Berg
5de36f5669 Merge pull request #11916 from umbraco/v9/feature/merge_v8_27012022 
V9/feature/merge v8 27012022
 2022-01-27 17:38:32 +01:00