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

36276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Butland
d8ef341854 Refactored to async where appropriate. 
Added call to new abstraction in member authorize attribute.
 2020-11-18 16:52:40 +01:00
Andy Butland
0fbe01cd22 Created new abstraction IUmbracoWebsiteSecurity and migrated controller's using it (replacing MembershipHelper) to Umbraco.Web.Website. 2020-11-18 16:12:42 +01:00
Shannon Deminick
64609475d3 Merge pull request #9248 from umbraco/netcore/task/6973-migrating-authenticationcontroller 
Migrate remaining bits AuthenticationController and BackOfficeController OAuth methods
 2020-11-18 16:03:21 +11:00
Shannon
99247d7fbe Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
 2020-11-18 16:02:51 +11:00
Shannon Deminick
7e36bf55b5 Merge pull request #9257 from umbraco/netcore/task/6973-migrating-authenticationcontroller-merge 
Merges netcore/dev (from merge_umbraco_id_into_netcore_dev) into the 6973-migrating-authenticationcontroller branch
 2020-11-18 15:58:35 +11:00
Elitsa Marinovska
dd5f400cf3 Netcore: Migration of Model classes from Umbraco.Infrastructure to Core (#9404) 
* Migrating more model, mapping and tree classes

* Migrating files from Mapping dir without Newtonsoft dependency

* Migrating files from PublishedContent and Editors dirs without Newtonsoft dependency + some more of the same kind

* Migrating DataType class without the usage of Newtonsoft.Json and making the corresponding changes to all classes affected

* Combining 3 ContentExtensions files into 1

* Refactoring from migrating ContentExtensions

* Migrating more classes

* Migrating ContentRepositoryExtensions - combining it with existing file in Umbraco.Core

* removing Newtonsoft json dependency & migrating file. Adding partial migration of ConfigurationEditor, so PropertyTagsExtensions can be migrated

* Migrating ContentTagsExtensions, and refactoring from changes in PropertyTagsExtensions

* Changes that should be reverted once ConfigurationEditor class is fully migrated

* VS couldn't find Composing, so build was failing. Removing the using solves the problem

* Handling a single case for deserializing a subset of an input

* Small changes and added tests to JsonNetSerializer

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated ConfigurationEditor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-17 20:27:10 +01:00
Paul Johnson
d498c1a2cd Netcore: Turn container validation back on (#9401) 
* Remove RuntimeLevelAttribute & disable filtering

* Remove RuntimeLevelAttribute usage on Composers

* Fix broken tests

* Resolve UserManager registration issues.

* Turn container validation back on.

* Resolve lifetime issue post install backoffice.

* Remove final TODO: MSDI
 2020-11-17 08:56:04 +01:00
Bjarke Berg
76aada2aef Merge pull request #9380 from rustybox/feature/netcore/msdi-refactor-use-DefaultControllerActivator 
Netcore: Use DefaultControllerActivator
 2020-11-16 13:16:31 +01:00
Bjarke Berg
13964d398b Merge remote-tracking branch 'origin/netcore/netcore' into feature/netcore/msdi-refactor-use-DefaultControllerActivator 
# Conflicts:
#	src/Umbraco.Web.Website/Extensions/UmbracoWebstiteServiceCollectionExtensions.cs
#	src/Umbraco.Web.Website/Runtime/WebsiteComposer.cs
 2020-11-16 10:35:51 +01:00
Elitsa Marinovska
a1f9bc9b17 NetCore: Install page db checks (#9388) 
* Making more explicit checks for the db type

* Fixed confusion with both ints and strings

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-13 08:50:35 +01:00
Bjarke Berg
e46a248832 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
 2020-11-12 13:10:19 +01:00
Bjarke Berg
d756248c7c Merge remote-tracking branch 'origin/netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge 
# Conflicts:
#	src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Services/MemberServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.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
#	src/Umbraco.Web.UI/config/umbracoSettings.config
 2020-11-12 12:57:03 +01:00
Bjarke Berg
bb1b04be15 Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375) 
* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved SurfaceControllerTypeCollection + Builder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved Extension methods

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Removed Wrap methods.. People should use their own TagBuilder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-12 11:01:19 +01:00
Bjarke Berg
eaf6543f99 post merge 2020-11-12 09:50:55 +01:00
Bjarke Berg
b2bcdb898e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Services/IconService.cs
 2020-11-12 09:13:53 +01:00
Paul Johnson
7561bb5244 No need to register controllers into container, DefaultControllerActivator works fine. 2020-11-11 19:15:30 +00:00
Paul Johnson
8775770d76 Remove BuildServiceProvider call from UmbracoWebServiceCollectionExtensions (#9372) 2020-11-10 20:04:29 +01:00
Andy Butland
b4ce2873cc NetCore: Migrated database server registrar and messenger tasks into hosted services (#9353) 
* Migrated database server registrar and messenger tasks into hosted services.
Moved DatabaseServerRegistrar Options into injectable configuration.

* Added further cases for unit tests on hosted services checking execution based on runtime level.

* Migrated DatabaseServerMessengerOptions into configuration.
 2020-11-10 20:02:09 +01:00
Paul Johnson
3f5f85880e NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356) 
* Split Bootstrap code from CoreRuntime

* Make ContentService method signatures match interface
prevents need to hide the concrete class in tests

* Remove Current

Only bit that bugs me is TreeNode for IconFilePath
I get the feeling it's dead code, but can just use a setter in cs or work out path in js if required.

* Fix tests, remember to terminate IRuntime
 2020-11-10 09:50:47 +01:00
Bjarke Berg
190ff2ae6d Merge pull request #8747 from AndyButland/feature/avoid-sync-io-exception-on-image-render 
Resolves issue with rendering back-office media selections when synchronous IO is not allowed.
 2020-11-09 06:35:11 +01:00
Andy Butland
0351a3eed4 Merge branch 'netcore/netcore' into feature/avoid-sync-io-exception-on-image-render 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeServiceCollectionExtensions.cs
 2020-11-06 15:16:51 +01:00
Bjarke Berg
27fd71225e Merge pull request #9287 from umbraco/netcore/feature/AB9042-migrate-from-infrastructure 
Netcore: Migration of classes from Umbraco.Infrastructure
 2020-11-05 13:02:49 +01:00
Bjarke Berg
ffd28b1fb8 More enums as string in UI 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-04 19:50:01 +01:00
Bjarke Berg
09e5e68e77 Fix enum to string issue for HealthCheck StatusResultType 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-04 14:47:00 +01:00
Bjarke Berg
52550efc03 Fix language to a language that exists in .net core 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-04 13:56:44 +01:00
Bjarke Berg
595b64c6f0 Handle UI issues now enums always are strings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-04 13:17:20 +01:00
Sebastiaan Janssen
e42b8b20f4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-11-04 11:30:27 +01:00
Sebastiaan Janssen
ca098e8a01 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 11:27:28 +01:00
Sebastiaan Janssen
0608862da9 Revert "Adds icons from App_Plugins/**/Icons/*.svg (#8884)" 
This reverts commit d7bf980f12.
 2020-11-04 11:25:45 +01:00
Sebastiaan Janssen
466f59c8d4 Bump version to 8.9.1 2020-11-04 11:22:47 +01:00
Sebastiaan Janssen
d7f10ff154 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 11:21:03 +01:00
Sebastiaan Janssen
54ad4c2481 Bump version to 8.8.2 2020-11-04 11:19:32 +01:00
Sebastiaan Janssen
cea8ac35b3 Merge branch 'v8/8.8.1' into v8/8.8 2020-11-04 11:12:15 +01:00
Mole
d0ca07bce2 Merge pull request #9336 from umbraco/netcore/feature/migrate_custom_view_engines 
Netcore: Migrate our custom view engines
 2020-11-04 10:08:51 +01:00
Sebastiaan Janssen
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +01:00
Sebastiaan Janssen
bff6ded89d Merge branch 'v8/8.7' into v8/8.8 2020-11-04 09:27:02 +01:00
Sebastiaan Janssen
d4fa37d6fb Merge branch 'v8/8.6' into v8/8.7 2020-11-04 09:25:33 +01:00
Bjarke Berg
9b9b5d70be Merge branch 'netcore/netcore' into netcore/feature/migrate_custom_view_engines 2020-11-04 08:40:28 +01:00
Bjarke Berg
dae6e2b8ee Migrated RenderNoContentController + related (#9309) 
* Migrated RenderNoContentController + related

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fix after MSDI

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Update src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

* Removing connection string

* Fixed tests after moving endpoint registration

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-11-03 18:55:55 +01:00
Elitsa Marinovska
6d23075d9a Migrating the rest of the files from ContentEditing\ 2020-11-03 16:36:59 +01:00
Elitsa Marinovska
5104430879 Changing the way we register json converters globally 2020-11-03 16:36:09 +01:00
Warren Buckley
dbee98bf02 Merge pull request #9258 from umbraco/v8/feature/AB8699-Support-blocks-in-clipboard-service 
Support blocks in backoffice clipboard
 2020-11-03 13:48:07 +00:00
Bjarke Berg
1a4a72ee21 Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 14:35:27 +01:00
Bjarke Berg
aefb596b4b More viewengine migration. Including wrapping in profiler etcs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 14:25:45 +01:00
Niels Lyngsø
67367fe111 display an error message if settings does not align. 2020-11-03 13:38:54 +01:00
Bjarke Berg
3faf0cb9ce Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate_custom_view_engines 2020-11-03 13:25:55 +01:00
Bjarke Berg
3cf45c9e88 Merge pull request #9329 from AndyButland/feature/amend-health-check-notifier-first-run-time-to-crontab 
.NetCore: change health check notifier first run time to cron expression
 2020-11-03 12:06:34 +01:00
Bjarke Berg
94b9f7453c Fix boot issue, because hosted services uses IServerMessenger that uses ISqlContext before the db is ready 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 11:20:51 +01:00
Bjarke Berg
9776816282 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate_custom_view_engines 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 10:51:00 +01:00
Bjarke Berg
9cda7d1b5a Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account 
(cherry picked from commit 223b19cbd8)
 2020-11-03 10:22:15 +01:00