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
|
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 |
|
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
|
bef8cb9589
|
Added old ctor to avoid a breaking change
|
2020-09-08 14:32:09 +02:00 |
|
Bjarke Berg
|
e079bd5a50
|
Cleanup usages of Configs
|
2020-09-08 13:03:43 +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 |
|
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 |
|
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 |
|
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 |
|
Claus
|
46b4b22dcd
|
Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml
V8/bugfix/return IHtmlString from GetBlockListHtml
|
2020-09-04 13:55:45 +02:00 |
|
Shannon
|
123e3cb22b
|
fix build
|
2020-09-04 10:12:55 +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 |
|
Niels Lyngsø
|
1a35017d8f
|
AC7976 dont place runtime vars in model (#8807)
|
2020-09-03 11:09:17 +02:00 |
|
Sebastiaan Janssen
|
10281cb0e6
|
Merge branch 'v8/dev' into v8/contrib
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
|
2020-09-02 14:23:40 +02:00 |
|
Sebastiaan Janssen
|
79ac19bff8
|
Merge branch 'v8/8.7' into v8/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
# src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
# src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/packages/edit.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
|
2020-09-02 10:14:10 +02:00 |
|
Bjarke Berg
|
97e6d76ec9
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten
|
2020-09-02 10:03:53 +02:00 |
|
Bjarke Berg
|
90d14158ee
|
Clean up - Removed duplicate ctor in UmbracoVersion
|
2020-09-02 09:05:55 +02:00 |
|
Poornima Nayar
|
c1e2f8f974
|
RedirectToUmbracoPageResult - Extended to allow a Guid (#8139)
|
2020-08-31 22:06:04 +02:00 |
|
Bjarke Berg
|
cb88865a7d
|
Added iconApiBaseUrl to BareMinimumServerVariables
|
2020-08-31 15:23:43 +02:00 |
|
Nikolaj
|
10aae75ec6
|
Return IHtmlString instead of MvcHtmlString from GetBlockListHtml
|
2020-08-31 11:08:44 +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 |
|
Bjarne Fyrstenborg
|
61e96781da
|
V8.7RC Update block list live editing description (#8687)
|
2020-08-26 20:19:49 +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 |
|
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
|
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 |
|
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
|
aedd7563a4
|
Restored Umbraco.Tests (further)
|
2020-08-24 22:58:23 +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
|
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
|
89b725ef28
|
Reverted non netcore related project amends in order to limit changes to those necessary for the netcore executable call stack.
|
2020-08-23 14:05:35 +02: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 |
|