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

88 Commits

Author SHA1 Message Date
Mole
bf41c2eeaa Netcore: Align namespaces (#9801) 
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
 2021-02-18 11:06:02 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Bjarke Berg
c98efe047f Cleanup of duplicate entries in csproj and disabled compiled views as default from template (To work with purelive) 2021-02-05 12:27:30 +01:00
Bjarke Berg
8624a246ba Updated healthchecks to show a link to documentation instead of trying to fix something that can often not be fixed automatically. 2021-02-03 07:42:56 +01: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
acdaba5d47 more cleanup 2021-01-19 19:16:42 +11:00
Shannon
f320d41b1d Commits progress so far, then will cleanup a bunch 2021-01-19 15:46:25 +11: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
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
Bjarke Berg
a1df7c159a Post merge - Fix build 2020-12-01 11:39:24 +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
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
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
Mole
75608919cd Merge pull request #8925 from umbraco/netcore/feature/use-serilog-to-log-all-messages 
Netcore: Use serilog to log all messages and use appsettings as config
 2020-09-23 09:37:43 +02:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Elitsa Marinovska
0f9595a5b1 Updates nuget packages versions to latest 2020-09-17 17:58:11 +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
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
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
06713ea03a Clean up + reintroduced some notes, that will maybe be usefull when website rendering is ready 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-09 12:46:23 +02:00
Nikolaj
fc83ea5edd Remove more generated files 2020-09-08 11:23:27 +02:00
Nikolaj
7ac4e6c387 Disabling pre compiled view should be a workaround and not default 2020-09-08 10:42:39 +02:00
Nikolaj
b6be2b4a0c Remove pure live generated cs files 
They will cause a myriad of trouble
 2020-09-08 10:27:05 +02:00
Bjarke Berg
3efee8284a Post merge fixes 2020-09-07 15:28:58 +02:00
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Nikolaj
1eb7e9c1eb Add further progress 2020-09-02 14:44:01 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Bjarke Berg
66a0125d3f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
 2020-08-21 13:26:00 +02:00
Bjarke Berg
091a777b62 Conditional load of netframework dlls 2020-08-19 19:51:06 +02:00
Bjarke Berg
95c30d4cd0 Fix for packages 2020-08-12 15:59:30 +02:00
Bjarke Berg
996130b58d Post merge fix 2020-08-12 13:26:24 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
cdd2dc51b4 Copy files on publish 2020-08-12 10:03:40 +02:00
Bjarke Berg
f7e0b115aa copy language files on publish 2020-08-11 15:00:39 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Elitsa Marinovska
6797f5af5b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 2020-07-13 13:44:04 +02:00
Elitsa Marinovska
c0d266fc92 Migrating project to .net core 2020-07-13 13:38:41 +02:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:15:38 +02:00
Bjarke Berg
add44c4139 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/fix-integration-tests 2020-07-10 13:50:44 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
1c38b25cfb fix for csproj file 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:04:24 +02:00
Bjarke Berg
b4bc1f79b5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-10 13:03:35 +02:00
Elitsa Marinovska
498f01fa10 Removing duplicated folder reference 
which causes the proj to not load in Visual Studio
 2020-07-10 11:24:50 +02:00