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

35469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
d7ab7d3d2e Removed test code 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-18 08:30:48 +02:00
Bjarke Berg
9cfae2c935 Merge pull request #8891 from umbraco/netcore/feature/8651-config-options-pattern-refactor 
Netcore: Replace configurations with IOptions pattern
 2020-09-18 08:20:03 +02:00
Bjarke Berg
380bec0e2f Fixed wrong config file path 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-18 07:05:40 +02:00
Bjarke Berg
1334fd0c5e Typo 2020-09-16 11:47:37 +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
b7a48686f0 Updates based on review feedback 2020-09-15 13:18:01 +02:00
Bjarke Berg
9c91dd5994 Fixed test 2020-09-15 12:23:41 +02:00
Bjarke Berg
5836ca3da4 Bugfix - Imagesharp cache folder is not relative to root but to the wwwroot. "~" is not replaced with root 2020-09-15 10:27:23 +02:00
Bjarke Berg
9d91e629c6 Bugfix in CheckIfUserTicketDataIsStaleAttribute 2020-09-15 10:13:05 +02:00
Bjarke Berg
4918841154 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/8651-config-options-pattern-refactor 2020-09-15 09:36:29 +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
Bjarke Berg
b4353585c3 Simplifyed the ConnectionStrings config 2020-09-15 09:11:36 +02:00
Bjarke Berg
4a4b57ef87 bugfixes related to no umbraco connection string 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-14 21:53:56 +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
dc8933b6b9 Removed test code 2020-09-14 15:05:32 +02:00
Bjarke Berg
8141e7c6c8 Bugfix 2020-09-14 14:35:57 +02:00
Bjarke Berg
1599e74193 Removed Umbraco.Configuration project 2020-09-14 14:15:09 +02:00
Bjarke Berg
e74570c0ac More clean up of old configs 2020-09-14 14:12:38 +02:00
Bjarke Berg
4173a2fb20 More clean up of old configs 2020-09-14 12:58:41 +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
e6ad34da1d More clean up of old configs 2020-09-14 09:13:53 +02:00
Bjarke Berg
5b90a469e9 More clean up of old configs 2020-09-14 09:01:57 +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
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
7f89299150 Fixed tests 2020-09-10 09:04:17 +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