Commit Graph

35400 Commits

Author SHA1 Message Date
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
af59a7a0b9 Do not login after install. This currently leads to issues due to the restart. 2020-09-15 13:47:54 +02:00
Bjarke Berg
7d8c9ee4c9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-09-15 09:35:57 +02:00
Bjarke Berg
c9243d9d61 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-09-15 09:35:05 +02:00
Bjarne Fyrstenborg
600ae926d4 Remove local function to create guid and use String.CreateGuid() extension function instead (#8886) 2020-09-13 22:21:30 +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
bf70c03c4a Merge pull request #8851 from umbraco/netcore/feature/ModelsBuilderEmbedded-migration-roslyn-compiler
Netcore/feature/models builder embedded migration roslyn compiler
2020-09-09 14:10:09 +02:00
Bjarke Berg
96f8dd2103 Merge pull request #8622 from umbraco/v8/feature/AB7482-acceptance-tests-for-content
Acceptance tests for Content
2020-09-09 13:28:48 +02:00
Bjarke Berg
f58e1e8edb Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
2020-09-09 13:14:20 +02:00
Sebastiaan Janssen
1f44b94ef6 Merge branch 'v8/dev' into v8/contrib
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
2020-09-09 12:52:42 +02:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
2020-09-09 12:48:28 +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
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
164c62841d Added seperators (newlines) between parts of the string used for the hash
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-09 11:17:21 +02:00
Bjarke Berg
79bfe22650 Added internals visible to for test projects
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-09 11:15:44 +02:00
Bjarke Berg
8a68ba9547 Removed the init of legacy MB. Future versions of the full MB will have to disable the embedded MB
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-09 11:15:14 +02:00
Bjarke Berg
6e25885804 Simplified the drag and drop 2020-09-09 10:29:41 +02:00
Bjarke Berg
b4b7bb438d updated version of testhelpers 2020-09-09 07:51:05 +02:00
Bjarke Berg
7641b8da54 Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/AB7482-acceptance-tests-for-content
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
2020-09-09 07:46:35 +02:00
Bjarke Berg
34c09ce12d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 2020-09-08 21:05:58 +02:00
Bjarke Berg
d80a9cbe58 Merge pull request #8852 from umbraco/netcore/bugfix/disable-url-tracking
NetCore: Fix for disabling/enabling url tracking
2020-09-08 20:50:51 +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
Nikolaj
6cd8617202 Fix tests 2020-09-08 15:17:57 +02:00
Bjarke Berg
55491338d9 Merge pull request #8847 from umbraco/netcore/bugfix/mapping-from-route
NetCore: Fix for mapping route param
2020-09-08 15:02:26 +02:00
Sebastiaan Janssen
ecff24089c Bump version to 8.7.0 2020-09-08 14:46:22 +02:00
Bjarke Berg
bef8cb9589 Added old ctor to avoid a breaking change 2020-09-08 14:32:09 +02:00
Elitsa Marinovska
0f7ad6b00c Fixes issue https://github.com/umbraco/Umbraco-CMS/issues/8816 on alpha001 regarding incorrect mapping of id param 2020-09-08 13:12:36 +02:00
Nikolaj
a6580cc3c5 Add documentation comments to RoslynCompiler and LoadContext 2020-09-08 12:24:34 +02:00
Warren Buckley
c3d69df27b Merge pull request #8842 from umbraco/v8/bugfix/block-list-copying
Ensure new UDIs for blocks when copying
2020-09-08 11:19:18 +01:00
Ronald Barendse
ddc922a583 8.7RC Add generic BlockListItem classes (#8841)
(cherry picked from commit 5faa9ae22f)
2020-09-08 12:11:14 +02:00
Ronald Barendse
5faa9ae22f 8.7RC Add generic BlockListItem classes (#8841) 2020-09-08 12:08:27 +02:00
Nikolaj
fc83ea5edd Remove more generated files 2020-09-08 11:23:27 +02:00
Nikolaj
2bb3612bcb Enable models builder 2020-09-08 10:57:15 +02:00
Nikolaj
7496e7c9a0 Set ModelsBuilderConfig back to default to true 2020-09-08 10:56:41 +02:00
Claus
f20920167a Merge pull request #8844 from umbraco/v8/bugfix/remove-blocklistextensions
V8.7RC: Removing extensions for GetBlockListHtml on IPublishedContent
2020-09-08 10:46:06 +02:00
Nikolaj
7ac4e6c387 Disabling pre compiled view should be a workaround and not default 2020-09-08 10:42:39 +02:00
Claus
bb30b17fe2 removing duplicated extension methods that could encourage bad practice when used in the wrong way.
(cherry picked from commit 11e42c0a56)
2020-09-08 10:37:35 +02:00
Claus
11e42c0a56 removing duplicated extension methods that could encourage bad practice when used in the wrong way. 2020-09-08 10:36:35 +02:00
Nikolaj
983ac2cca5 Remove CodeGen var
I believe this was used for the build manager which would get maed if the base directory changed, roslyn shouldn't care though
2020-09-08 10:34:47 +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
Nikolaj
3eb897a16f Move genereated files to the Umbraco folder 2020-09-08 10:21:11 +02:00
Claus
3d385cc1db Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml
V8/bugfix/return IHtmlString from GetBlockListHtml

(cherry picked from commit 46b4b22dcd)
2020-09-08 10:05:39 +02:00
Shannon
6e2576fb0d Ensure the component runs and don't replace UDIs on saving since its not necessary 2020-09-08 11:47:31 +10:00
Shannon
98bda6759e Adds more tests, cleans up tests 2020-09-08 11:25:37 +10:00
Shannon
56dd39bb1a cleanup 2020-09-08 02:09:05 +10:00
Shannon
a2c24bcc76 Gets copying logic working for the block editor, needs more tests though 2020-09-08 02:07:02 +10:00
Warren Buckley
a7a560aa26 Merge pull request #8809 from umbraco/v8/bugfix/8801-resolvers-should-be-registred-for-specific-clipboard-entry-types
V8.7RC: Clipboard resolvers should target specific entry types
2020-09-07 14:43:36 +01:00
Nikolaj
f14b3f78a9 Remove unused usings 2020-09-07 12:44:24 +02:00