Commit Graph

36577 Commits

Author SHA1 Message Date
James Jackson-South
6d1cd89f4e Fix tests build 2020-12-01 20:41:18 +00:00
James Jackson-South
c9b7655f1d Fix missing namespace replacements. 2020-12-01 14:59:08 +00:00
James Jackson-South
0369375d8e Merge branch 'netcore/netcore' into netcore/feature/9397 2020-12-01 12:44:10 +00:00
James Jackson-South
748cbb1f7b Normalize builder namespace 2020-12-01 12:42:14 +00:00
James Jackson-South
ea79051104 Register as singleton, test DI into handlers. 2020-12-01 12:09:50 +00:00
Bjarke Berg
a1df7c159a Post merge - Fix build 2020-12-01 11:39:24 +01:00
Bjarke Berg
85c01d9905 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
2020-12-01 11:34:13 +01:00
Bjarke Berg
739194d71f Post merge - Fix for acceptance tests 2020-12-01 11:02:11 +01:00
Bjarke Berg
27b44c6594 Post merge - Fix for tests 2020-12-01 09:14:46 +01:00
Bjarke Berg
3e0d52b330 Merge pull request #9428 from umbraco/netcore/task/6666-auth-policies
Migrate authorization filters to authorization policies
2020-12-01 08:17:04 +01:00
Shannon
a995cdc360 Fixes TryConvertTo with StringValues 2020-12-01 16:08:16 +11:00
Shannon
e431c82edc fix returning null issue 2020-12-01 15:20:34 +11:00
James Jackson-South
a3cc3769c0 Mocking should be an act of desperation! 2020-12-01 01:13:08 +00:00
James Jackson-South
e41122eb8c Add EventAggregator 2020-11-30 23:39:56 +00:00
Bjarke Berg
13374a8654 post merge
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-30 11:57:00 +01:00
Bjarke Berg
1aea3f9085 Merge pull request #9414 from umbraco/netcore/feature/linux-paths
Linux paths
2020-11-30 11:30:53 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
2020-11-30 11:24:24 +01:00
Shannon
36b3a2b62a fixes media authz resource policies 2020-11-30 19:38:55 +11:00
Shannon
76cbd76f32 Fixes content resource authz 2020-11-30 19:09:14 +11:00
Bjarke Berg
85df7be7e8 Added TestEnvironment
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-30 08:51:12 +01:00
Bjarke Berg
6ce8e55210 Removed check for ValidateStylesheet while file systems don't support both web and content root
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 22:11:51 +01:00
Bjarke Berg
9af77e5f51 Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 21:53:31 +01:00
Bjarke Berg
8fdf65c78a Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 20:49:19 +01:00
Bjarke Berg
41bdfd940c Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 20:34:48 +01:00
Bjarke Berg
f9c51930f7 Add temp logging, to debug azure pipeline
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 19:39:43 +01:00
Sebastiaan Janssen
862a7fdce6 Merge branch 'v8/contrib' into v8/dev 2020-11-27 14:04:55 +01:00
Matt Brailsford
a6f5e48f43 Introduce content app helper (#9425) 2020-11-27 14:02:19 +01:00
Bjarke Berg
2fb7f3ef84 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths
# Conflicts:
#	src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs
2020-11-27 13:49:42 +01:00
Bjarke Berg
3b0d33a84c Revert "Moves some files, adds notes, starts poc for back office login providers"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:58 +01:00
Bjarke Berg
1833bfa1a9 Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:34 +01:00
Bjarke Berg
efce67fe8a Revert "Moves auto linking logic to the BackOfficeSignInManager"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:17:13 +01:00
Bjarke Berg
7d61020214 Revert "Ensures that all back office controllers are authenticated under the back office scheme"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:16:50 +01:00
Bjarke Berg
96ef2fd9b7 Revert "Cleans up BackofficeSecurity, fixes up AuthenticationController for endpoints that aren't authorized (and simplifies)"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:16:22 +01:00
Bjarke Berg
348f69734b Revert "FIxes more of the auth procedure"
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:15:54 +01:00
Warren Buckley
7d3878842a Merge pull request #7560 from umbraco/v8/feature/ensure-umb-editor-is-within-viewport
keep umb-editor inside viewport width
2020-11-27 11:11:42 +00:00
Warren Buckley
e41855b175 Merge pull request #7227 from umbraco/v8/feature/0000-remove-out-icon
V8/feature/0000 remove out icon
2020-11-27 10:28:52 +00:00
Niels Lyngsø
48d5682cab Merge remote-tracking branch 'origin/v8/dev' into v8/feature/0000-remove-out-icon
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
2020-11-27 11:15:37 +01:00
Warren Buckley
46743506ad Merge pull request #7155 from umbraco/v8/feature/0000-NodeJS-minimum-version
set a minimum version requirement for node
2020-11-27 10:08:04 +00:00
Warren Buckley
2d1081c51e Merge pull request #7444 from umbraco/v8/feature/round-corners-in-media-picker
added round corners in umb-media-grid for media-picker
2020-11-27 10:06:56 +00:00
Niels Lyngsø
5bbf0d04d2 require node v.10 2020-11-27 11:04:07 +01:00
Niels Lyngsø
d5b0080c51 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/0000-NodeJS-minimum-version
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
2020-11-27 11:02:50 +01:00
Bjarke Berg
efa6d82865 Don't use C# preview features yet
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 09:45:24 +01:00
Bjarke Berg
ab924e0c7d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths 2020-11-27 09:42:57 +01:00
Bjarke Berg
e13ea4e9fb rollback appsettings.json
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 09:42:19 +01:00
Bjarke Berg
fc9e0fa244 Removed old XmlConfigManipulator
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 09:05:12 +01:00
Bjarke Berg
b9173ef6bb Removed wrong ctor from PhysicalFileSystem
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 09:00:50 +01:00
Bjarke Berg
87591b5007 Set timeout on upgradecheck. Don't what to hang if that server is unresponsive
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 08:47:32 +01:00
Shannon
ec6ac41e56 FIxes more of the auth procedure 2020-11-27 15:58:00 +11:00
Shannon
47ab15f457 Cleans up BackofficeSecurity, fixes up AuthenticationController for endpoints that aren't authorized (and simplifies) 2020-11-27 15:42:41 +11:00
Shannon
313a2e6f7c Ensures that all back office controllers are authenticated under the back office scheme 2020-11-27 13:32:41 +11:00