yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,315 Commits 4 Branches 7 Tags
8a9c3d0c2e4cdaaedffd8e4eb96c4219d8fc5ddc
Commit Graph

880 Commits

Author SHA1 Message Date
Emma Garland
7df0040127 Merge branch 'netcore/netcore' into netcore/members-userstore 2021-01-25 10:07:53 +00:00
Emma Garland
9ba78497a0 Merge branch 'netcore/netcore' into netcore/members-userstore 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
 2021-01-19 15:29:40 +00:00
Shannon
1614e9a53c Removes MB.Enabled since it doesn't make since, Removes MB.EnableFactory since that cannot ever be not enabled, fixes up settings usage, primarily we just check for models mode 2021-01-19 18:29:14 +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
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
Emma Garland
e5d7f53a1e Merge branch 'netcore/netcore' into netcore/members-userstore 2021-01-12 14:28:47 +00:00
Shannon
2044b82bb4 turns off the endpoint matching logic - makes it configurable since it shouldn't be needed 2021-01-11 16:43:01 +11:00
Sebastiaan Janssen
ca5c56dccd Merge branch 'v8/8.10' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
 2021-01-08 15:43:45 +01:00
Emma Garland
ba317b24dc Merge branch 'netcore/netcore' into netcore/members-userstore 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentControllerBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
 2021-01-04 17:04:05 +00:00
Warren Buckley
36cb34285c Telemetry revisited - Move from App_Data file to UmbracoSettings.config (#9554) 2020-12-16 08:50:59 +01:00
Mole
d408e15c71 Merge pull request #9512 from umbraco/netcore/feature/plugin_static_files 
Netcore: Read static files from app_plugins folder
 2020-12-09 10:30:15 +01:00
patrickdemooij9
0a3a0f4f76 9078: Allow changing the login logo through umbracoSettings (#9083) 
* 9078: Allow changing the login logo through umbracoSettings

* 9078: Add default login logo in code
 2020-12-09 09:23:48 +01:00
Nikolaj
7ef6501bb1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
 2020-12-09 08:45:28 +01:00
Bjarke Berg
6bd8285a80 Added Configuration files and license to default BrowsableFileExtensions 2020-12-08 14:30:51 +01:00
Bjarke Berg
f580e38383 Added fonts to default BrowsableFileExtensions 2020-12-08 13:18:23 +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
Emma Garland
9531550e86 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-08 11:04:17 +00:00
Shannon
ea55d2662e no app_data paths, changing to constants, some linting updates 2020-12-08 10:42:26 +11:00
emmagarland
b59935c799 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-07 17:26:15 +00:00
Bjarke Berg
e7d9d38c52 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
#	src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
 2020-12-07 12:55:47 +01:00
Andy Butland
9f8138b2d0 Adhered to linting rules configuration models, validators and tests. 2020-12-06 10:51:31 +01:00
emmagarland
0560bef48c Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-05 18:14:09 +00:00
Bjarke Berg
21e3cf0887 Moved files and introduced IMarkdownToHtmlConverter to avoid packages to handle markdown in core 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-04 13:03:40 +01:00
emmagarland
f1fbeb8ad3 Set hasIdentity if there is an ID, and logical adjustments to set passwords corectly 2020-12-03 01:27:54 +00:00
James Jackson-South
601270640c Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-11-30 21:19:32 +00:00
Bjarke Berg
fc9e0fa244 Removed old XmlConfigManipulator 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-27 09:05:12 +01:00
James Jackson-South
de70b58183 Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-11-18 23:59:53 +00:00
Benjamin Carleski
7583c1fb06 Start cleanup of IOHelper.MapPath calls 2020-11-18 07:25:11 -08: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
James Jackson-South
4678e00fa4 Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/linting 2020-11-11 16:24:27 +00: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
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
James Jackson-South
4aa85073d0 Update copyright notice based on root license 2020-11-03 17:47:16 +00:00
James Jackson-South
5321b761a5 Add stylecop linting and example fix. 2020-11-03 17:31:05 +00:00
Bjarke Berg
8e44d89856 Introducing interface for our needs of a CronTabParser. And inject it where needed 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-03 09:36:56 +01:00
Bjarke Berg
2da6c8517a Merge remote-tracking branch 'origin/netcore/netcore' into feature/amend-health-check-notifier-first-run-time-to-crontab 
# Conflicts:
#	src/Umbraco.Core/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-11-03 07:09:15 +01:00
Andy Butland
a0ce44c9fc Changed configuration of first run time for health check notifier from a time string to a cron expression. 2020-10-31 22:49:12 +01:00
Andy Butland
433fdbb047 Change LoggingSettings.MaxLogAge from integer (minutes) to a TimeSpan. 2020-10-31 14:25:40 +01:00
Andy Butland
9cb59239d1 Migrated KeepAlive recurring task to hosted service. 2020-10-30 17:19:01 +01:00
Andy Butland
bdb8f34da3 Netcore: Health check notifier hosted service (#9295) 
* Implemented health check notifier as a hosted service.
Added validation to health check settings.

* Registered health check notifier as a hosted service.
Modified health check nested settings to use concrete classes to align with other configuration models.

* Resolved issues with email sending using development server.

* PR review comments and fixed failing unit test.

* Changed period and delay millisecond and hourly values to TimeSpans.
Changed configuration of first run time for health check notifications to use H:mm format.

* Set up SecureSocketOptions as a locally defined enum.

* Tightened up time format validation to verify input is an actual time (with hours and minutes only) and not a timespan.

* Aligned naming and namespace of health check configuration related classes with other configuration classes.

* Created constants for hex colors used in formatting health check results as HTML.

* Revert "Tightened up time format validation to verify input is an actual time (with hours and minutes only) and not a timespan."

This reverts commit f9bb8a7a825bcb58146879f18b47922e09453e2d.

* Renamed method to be clear validation is of a TimeSpan and not a time.

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-30 13:56:13 +01:00
Shannon
64d8b56eca It builds! 2020-10-23 14:18:53 +11:00
Shannon
2b1dfc5888 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Mvc/UmbracoController.cs
 2020-10-22 21:16:44 +11:00
berg
070307ea88 Ensure unit tests run on linux 
Signed-off-by: berg <mail@bergmania.dk>
 2020-10-21 21:04:10 +02:00
Emma L Garland
7a570110d0 Netcore/feature/healthcheck replaceconfiglogic (#8934) 
* Started moving to JSON instead of config.
Mild refactoring but overall keeping it the same, except for injecting IConfiguration and JSON parsing instead of XML
Tests currently unaffected, need to increase coverage

* Moved to constants for appsettings keys
Moved from IConfiguration to global settings - later to be replaced with IOptions
Updated translation messages
Installed IOptions ready for new PR
Updated to new interface, IConfigurationService

* Post-merge fix

* Namespace move from Umbraco.Web to Umbraco.Core where appropriate

* Renamed abstractsettings (from abstractconfig)
Moving out of configservice into the POCO config check

* Made the IIsCustomErrors healthcheck as obsolete, as no web.config setting). Investigate reintroducing this check in the .NET Core way (UseDevelopment).
Reducing use of abstractsettings as not needed - we don't need a config service to read the config settings anymore as they're all explicit POCOs.
Consolidated health-checks in project.

* Removed test views that weren't meant to be added

* Returned to use of abstractsettings with different use

* Moved more health checks into correct folder/namespace, and enum into their own file

* Correct namespace

* Git history/compare lost due to file move, temporarily moving back to original folder. Will do another PR to move after this

* Use existing GetStatus in abstract check for Debug mode

* Updating to return to previous logic and putting files back into line

* Macro errors returned to previous logic

* Reuse abstractsettings class

* Swapped order to assist with reviewing PR

* Updated to include itempath

* Not implemented comment to avoid confusion
Implemented NotificationEmailCheck

* Changed to IOptionsMonitor as per PR comments. Removed configurationservice as we need to rethink the fixing strategy. Updated logger.
Needs to show fix message instead of fixing. Temporary fix for IIS version

* Switched to IOptionsMonitor for all

* No longer attempts to actually fix header in config. Still need to show suggestions.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-10-21 11:29:25 +02:00
Shannon
d1b35deb43 Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?) 2020-10-21 16:51:00 +11:00
Shannon
779214f9d3 preserve function names and update smidge 2020-10-16 15:23:02 +11:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +02:00
Bjarke Berg
35443f0e71 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
 2020-09-24 08:24:35 +02:00