yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,593 Commits 4 Branches 7 Tags
3c3c9a6a4772b94de30171b7c6f48ab59620d625
Commit Graph

400 Commits

Author SHA1 Message Date
Shannon
2a41cec263 Ensures the default PublishedModelFactory is always registered. Ensures AddModelsBuilder is done when adding the website (not required for the back office). 2021-02-01 16:53:24 +11:00
Elitsa Marinovska
21f1b49f16 Fixes missed change from Persistance to Persistence 2021-01-25 12:42:13 +01:00
Bjarke Berg
c5de3f86de Fix build 2021-01-22 07:46:30 +01:00
Bjarke Berg
c0961337d2 Fix build 2021-01-22 07:15:30 +01:00
Bjarke Berg
132c4f7910 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-21 09:37:44 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
Shannon
8d86d54bda fixes csproj to not include MB anything (among other things) 2021-01-20 19:33:33 +11:00
Shannon
6bed0e6c29 missing imports 2021-01-20 14:58:19 +11:00
Shannon
acdaba5d47 more cleanup 2021-01-19 19:16:42 +11:00
Shannon
0ce34bea18 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/models-builder-9789 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
 2021-01-19 17:43:18 +11:00
Shannon
f320d41b1d Commits progress so far, then will cleanup a bunch 2021-01-19 15:46:25 +11:00
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.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/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
Shannon
5f9447fc2a Got a POC working with dynamic recompilation 2021-01-15 18:17:13 +11:00
Bjarke Berg
fe016dd103 Netcore: Fixes issues with user invites (#9616) 
* AB9629
Fixes issues with user invites
- Issue with the generated link in the invite email
- Allow anonymous access to CurrentUserController.PostSetInvitedUserPassword, as it is used by users not logged in
- Allow anonymous access to AuthenticationController.GetPasswordConfig, as this is used to set a password for newly invited users, before they login

* Fix issues with invite flow

* Fix minor typos

* Fixed issue with validation response and remove/change avatar

* Fix issue with disable users, after all enums are handled like strings

* Fix tests

* Fix other validation issue

* Fix yet another validation issue

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-01-12 16:15:19 +01:00
Bjarke Berg
cdc3dbd7fe Merge pull request #9598 from umbraco/netcore/task/dist-cache-cleanup 
More cleanup & reorganizing
 2021-01-04 15:01:55 +01:00
Bjarke Berg
7dbb2dbf9a Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
 2021-01-04 12:10:56 +01:00
Shannon
34427b0104 Moves AddDistributed cache back to being called implicitly, ensures notification handlers are not added twice 2021-01-04 13:22:29 +11:00
Shannon
d46545faa0 For now, we explicitly require AddDistributedCache in Startup so it's not called twice. 2021-01-04 13:01:49 +11:00
Shannon
999c20a755 Fixes UmbracoIntegrationTest Mapping flag and missing using in Startup 2021-01-04 12:22:03 +11:00
Shannon
1a0d961e42 removes WebsiteComposer, BackOfficeComposer 2020-12-24 18:11:16 +11:00
Shannon
e8379d6c77 oops, trying to fix build 2020-12-23 12:27:47 +11:00
Shannon
7115e0a11e shuffles code with DependencyInjection namespace, forgot to commit changes to Startup 2020-12-23 12:02:01 +11:00
Shannon
86adf01f88 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing 
# Conflicts:
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
 2020-12-21 16:04:42 +11:00
Paul Johnson
6114fffb4a Remove HostBuilder UseUmbraco extension, it's not required. 2020-12-18 09:53:01 +00:00
Paul Johnson
431403e372 Fixup CoreRuntime so it starts after Startup.Configure 
Makes integration tests play nice with Components as RuntimeLevel will be correct
 2020-12-17 11:19:47 +00:00
Bjarke Berg
0151c435f1 Netcore: Package support for media + media types (#9547) 
* Add support for media when installing a package

* clean up

* Fix tests

* Add support for media when installing a package

* clean up

* Fix tests

* moved tests + test data

* Migrated package tests + resources

* Fix issue with media picker on package page, was empty after save.

* Added missing files

* Fix casing issue of resources

* Added test for media

* Fix tests for linux

* Fix test

* Fix issue with move media..

* Fix issue with adding files to packages

* Add MediaType permissions.

* Fix test

* Fix test

* Retry flaky tests, and added TODOs to fix those

* new attempt to fix test

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-12-16 22:26:47 +01:00
Shannon
ce508d08ec Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing 
# Conflicts:
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
 2020-12-16 16:18:10 +11:00
Bjarke Berg
1e09d0b063 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.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
 2020-12-14 22:16:21 +01:00
Bjarke Berg
07231bbfe0 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/netcore 2020-12-14 19:22:03 +01:00
Bjarke Berg
3a11c21ebc revert connection string 2020-12-14 19:21:35 +01:00
Bjarke Berg
1727a5d6f1 Added specific PhysicalFileProvider for the app_plugins folder, that also checks whether extensions are allowed. 2020-12-08 12:33:07 +01:00
Shannon
e3be4009c0 Getting front end routing poc going 2020-12-08 16:33:50 +11:00
Bjarke Berg
5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	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
 2020-12-07 12:31:26 +01:00
Shannon
10fc351470 merge cleanup 2020-12-04 13:09:08 +11:00
James Jackson-South
606d8bcf51 Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/feature/9397 2020-12-03 12:39:08 +00:00
Shannon
0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
 2020-12-02 13:14:47 +11: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
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
Shannon
efff96f711 Creates IBackOfficeSignInManager interface 2020-11-30 22:46:05 +11:00
Bjarke Berg
88c1259d84 Revert "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:33:01 +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
Shannon
e01abf2802 Moves some files, adds notes, starts poc for back office login providers 2020-11-26 19:24:55 +11:00
Bjarke Berg
87b6c4852f Merge pull request #9448 from AndyButland/feature/membership-helper-facade-2 
NetCore: Migrated member related partial views
 2020-11-26 06:38:11 +01:00
Bjarke Berg
2534a32b9f Handle all PartialViewMacros Templates as content + Aligned directory seperators 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-25 13:47:51 +01:00
Bjarke Berg
642c455024 Reuse UmbracoWebsiteSecurityAccessor.WebsiteSecurity and align with other templates, by saving in variable even if it is just used once. 
+

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-25 13:45:31 +01:00
Paul Johnson
633c391f85 Merge branch 'netcore/netcore' into netcore/feature/msdi-remove-composition 2020-11-24 12:05:32 +00:00
Andy Butland
b331d683ec Migrated member related partial views along with necessary methods from MembershipHelper into IUmbracoWebsiteSecurity. 2020-11-24 11:33:46 +01:00
Bjarke Berg
4a7f6d3cc1 Migrated partial views (#9420) 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-24 09:05:16 +01:00