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

449 Commits

Author SHA1 Message Date
berg
f11391961f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/use-serilog-to-log-all-messages 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
 2020-09-18 08:31:09 +02:00
berg
738bdfbbdd Moved umbraco file logging into minimal config 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-18 07:46:36 +02:00
Bjarke Berg
7d3bc9be1c Moved serilog config to appsettings and configured it to also catch MS logging messages. 
Added Console log for Development
 2020-09-17 09:01:10 +02:00
Bjarke Berg
b4353585c3 Simplifyed the ConnectionStrings config 2020-09-15 09:11:36 +02:00
Bjarke Berg
ce2da18304 Fixed based on review comments 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:27:31 +02:00
Bjarke Berg
e74570c0ac More clean up of old configs 2020-09-14 14:12:38 +02:00
Bjarke Berg
acb46119be More clean up of old configs 2020-09-14 12:57:47 +02:00
Bjarke Berg
1b4b17cbae More clean up of old configs 2020-09-14 11:56:22 +02:00
Bjarke Berg
2eee6d7386 Removed some of the old legacy configs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-11 21:13:18 +02:00
Bjarke Berg
dc643ab6a6 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
#	src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
#	src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
#	src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
 2020-09-10 14:01:38 +02:00
Bjarke Berg
a4e5029912 Refactored to remove Configs 2020-09-10 13:51:59 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	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/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Bjarke Berg
1923cf013c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/ModelsBuilderEmbedded-migration-roslyn-compiler 2020-09-09 12:38:16 +02:00
Bjarke Berg
43a11a637d https://github.com/umbraco/Umbraco-CMS/issues/8835: Moved DisableRedirectUrlTracking checks into the events, as it can be disabled/enabled without restart in netcore 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-08 20:49:04 +02:00
Elitsa Marinovska
78dd6c40da Fixes issue https://github.com/umbraco/Umbraco-CMS/issues/8835 on alpha001 regarding disabling/enabling url tracking 2020-09-08 15:50:52 +02:00
Bjarke Berg
e079bd5a50 Cleanup usages of Configs 2020-09-08 13:03:43 +02:00
Nikolaj
872364cfb3 Update constructor in PublishedModelFactory 2020-09-07 11:34:12 +02:00
Bjarke Berg
c8669b18c2 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 14:30:48 +02:00
Shannon
1c83c68862 Fixes integration tests localization text 2020-09-04 01:30:47 +10:00
Shannon
16e4ffb725 Fixes unsubscribing from static events on Terminate 2020-09-04 00:28:38 +10:00
Shannon
7c78b5b34f Updates CoreRuntime with better dependencies so we can disable caches, fixes integration test to run multiple callbacks registered for TearDown, ensure we TearDown the runtime. 2020-09-04 00:27:43 +10:00
Shannon
f84a93ae20 Adds IUmbracoBuilder to build the config so it's easier to split apart, ensures background tasks don't run in integration tests, uses a custom CoreRuntime to ensure we use SimpleMainDom, re-wires the UmbracoWebApplicationFactory so that duplicate Hosts are not running at the same time, fixes issues with overriding/shadowing, uses RAMDirectory in lucene for tests, fixes CoreRuntime's events that we're moved incorrectly and not backwards compat, adds new real non static events which we can use in integration tests to install the DB before the runtime state is calculated 2020-09-02 18:10:29 +10:00
Andy Butland
8638419088 Fixed dependency resolution issue in PackagingService. 2020-09-02 08:41:41 +02:00
Andy Butland
f1bda37a64 Updates following PR review. 2020-09-01 18:10:12 +02:00
Andy Butland
e6ac534069 Resolved post-merge issues. 2020-08-27 09:27:11 +02:00
Andy Butland
2a59a8385c Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
 2020-08-27 09:03:01 +02:00
Bjarke Berg
361125e84b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-into-netcore-netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-08-27 08:39:02 +02:00
Andy Butland
4e222f103e Reintroduced legacy config into CoreRuntime to support remaining use of Current.Configs (e.g. in UserInvite) 2020-08-26 18:21:09 +02:00
Bjarke Berg
ba129fa927 Skip ExamineLuceneComposer if not on windows and reintroduce ExamineComposer 2020-08-26 12:01:01 +02:00
Andy Butland
64f8752587 Removed introduced second constructors for IOptions based depenedencies and used Options.Create instead. 2020-08-26 11:58:44 +02:00
Andy Butland
96104b9fdf Fixed further failing tests. 2020-08-26 11:29:21 +02:00
Bjarke Berg
f286fdd855 Skip ExamineComposer if not on windows 2020-08-26 10:50:31 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Andy Butland
8fd59d546e Fixed failing tests. 2020-08-26 07:55:23 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Andy Butland
8241643183 Resolved various failing tests. 2020-08-25 12:30:43 +02:00
Andy Butland
967f0be705 Aligned property names in code with those in configuration. 2020-08-25 10:45:54 +02:00
Andy Butland
2ed3568295 Fix after merge. 2020-08-25 10:11:19 +02:00
Andy Butland
2ea89acaaa Merge branch 'netcore/netcore' into feature/8651-config-options-patten 
# Conflicts:
#	src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
 2020-08-25 10:09:54 +02:00
Bjarke Berg
95523e2a93 Merge pull request #8677 from umbraco/netcore/bugfix/send-notifications-dont-use-stmp-info-from-config 
Netcore: Fixes issue with notifications that did not use the SMTP from config
 2020-08-24 14:14:22 +02:00
Andy Butland
c3c8d79720 Merge branch 'netcore/netcore' into feature/8651-config-options-patten 2020-08-24 09:45:25 +02:00
Andy Butland
7884e4ca17 Resolved issues such that application boots and back-office is navigable. 2020-08-24 09:29:40 +02:00
Andy Butland
2cd91a5a54 Converted to IOptions over IOptionsSnapshot due to the latter only working in scoped services. 
Further amends to return to booting application.
 2020-08-23 23:36:48 +02:00
Andy Butland
2f22313ceb Restored Umbraco.Web and added temporary methods for converstion between legacy and new configuration models to maintain build. 2020-08-23 15:58:37 +02:00
Andy Butland
52a65caf88 Temporarily removed test and non netcore executable projects. 2020-08-21 15:27:06 +01:00
Andy Butland
510bd92e78 Amended injection of further settings to use IOptionsSnapshot. 2020-08-21 14:52:47 +01:00
Andy Butland
e3a44c6717 Moved configuration setting POCOs into Umbraco.Core and adjusted references. 
Amended injection of some settings to use IOptionsSnapshot.
 2020-08-20 22:18:50 +01:00
Shannon
d2f7c11e89 Fixes issue with scopes being disposed or referenced incorrectly 2020-08-21 00:02:35 +10:00
Bjarke Berg
6fb73502ed Fix issue with sending notifications, due to the StmpClient. Not we use the EmailSender that handles StmpClient correct 2020-08-20 14:46:22 +02:00