Bjarke Berg
|
1bfb64bdd8
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/Constants-AppSettings.cs
# src/Umbraco.Abstractions/ContentVariationExtensions.cs
# src/Umbraco.Abstractions/IMainDom.cs
# src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
# src/Umbraco.Abstractions/Runtime/IMainDom.cs
# src/Umbraco.Abstractions/Runtime/MainDom.cs
# src/Umbraco.Core/IMainDom.cs
# src/Umbraco.Core/MainDom.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Infrastructure/MainDom.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoComponentRenderer.cs
|
2020-01-23 13:16:49 +01:00 |
|
Bjarke Berg
|
fd11ef6ed1
|
Merge pull request #7306 from umbraco/v8/bugfix/AB3323-SqlMainDom
Introduce a new IMainDomLock and both default and sql implementations
|
2020-01-23 12:44:11 +01:00 |
|
Bjarke Berg
|
0d84bfb42e
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-01-23 10:34:06 +01:00 |
|
Shannon Deminick
|
3b63d9baa3
|
Merge pull request #7486 from umbraco/netcore/feature/AB4635-move-cache-refreshers
NetCore: Moved CacheRefreshers to abstractions
|
2020-01-23 20:18:48 +11:00 |
|
Shannon
|
877e0cca93
|
removes unneeded ctor param
|
2020-01-23 20:06:02 +11:00 |
|
Shannon
|
c7b0bf20b0
|
Removes RefreshByJson and changes macro cache refreshing to use objects
|
2020-01-23 19:48:15 +11:00 |
|
Shannon
|
52b93bfc9c
|
ensures only _sqlServerSyntax is used
|
2020-01-23 18:33:55 +11:00 |
|
Shannon
|
a020c52ff6
|
Simplifies IdKeyMap interface, moves the weird add mapping logic in PublishedSnapshotService to a composer.
|
2020-01-23 18:10:21 +11:00 |
|
Shannon
|
8d7ed7dd32
|
adds const fixing naming
|
2020-01-23 16:26:13 +11:00 |
|
Shannon
|
201927580c
|
Fixing accidental api signature breaking change
|
2020-01-23 16:23:27 +11:00 |
|
Shannon Deminick
|
238db1c908
|
Merge pull request #7430 from ronaldbarendse/v8/bugfix/enum-extensions
Clean up EnumExtensions
|
2020-01-23 15:03:51 +11:00 |
|
Dave Woestenborghs
|
d61090a225
|
#7452 set save state correctly for variant when setting schedule publishing
|
2020-01-22 21:27:35 +01:00 |
|
Bjarke Berg
|
47c211907a
|
AB4635 - Fixed up some of the review comments - Removed static (de)serializers and get the CacheRefresher from the collection
|
2020-01-22 14:09:20 +01:00 |
|
Bjarke Berg
|
d8427779ea
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-01-22 11:58:20 +01:00 |
|
Bjarke Berg
|
3bdfe84717
|
Merge pull request #7490 from benjaminc/netcore/feature/7370-inject-config-interfaces
Use dependency injection for config classes
|
2020-01-22 11:52:50 +01:00 |
|
Bjarke Berg
|
3e7c6c12b0
|
Removed support for vbhtml views
|
2020-01-22 11:45:18 +01:00 |
|
Bjarke Berg
|
2e0299cf7b
|
Removed used things
|
2020-01-22 11:44:56 +01:00 |
|
Ronald Barendse
|
c4da5703fd
|
Merge changes
|
2020-01-22 11:40:41 +01:00 |
|
Ronald Barendse
|
1cc6a8cb45
|
Rename SetVariesBy to SetFlag on the enum overload
|
2020-01-22 11:14:31 +01:00 |
|
Sebastiaan Janssen
|
ac675d14e9
|
Fixes build errors
|
2020-01-22 11:13:49 +01:00 |
|
Bjarke Berg
|
db27090ac0
|
Merge pull request #7233 from umbraco/v8/bugfix/6758-nucache-fix
When nucache updates are made the previous Gen root node is cleared
|
2020-01-22 11:13:43 +01:00 |
|
Ronald Barendse
|
6c2e1b29fd
|
Use SetVariesBy extension methods instead of SetFlag/UnsetFlag
|
2020-01-22 11:10:56 +01:00 |
|
Ronald Barendse
|
10f15a7648
|
Remove duplicate VariesBySegment overload after merge
|
2020-01-22 11:10:28 +01:00 |
|
Ronald Barendse
|
b01f2ed35e
|
Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions
|
2020-01-22 11:04:11 +01:00 |
|
Sebastiaan Janssen
|
a7b580b552
|
Merge branch 'v8/dev' into pr/7430
|
2020-01-22 10:56:21 +01:00 |
|
Bjarke Berg
|
1dfdfba236
|
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
|
2020-01-22 09:39:06 +01:00 |
|
Warren Buckley
|
81a0a52874
|
Merge branch 'v8/feature/media-tracking' into v8/dev
# Conflicts:
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
|
2020-01-22 08:36:32 +00:00 |
|
Bjarke Berg
|
efd4512e64
|
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
|
2020-01-22 09:18:30 +01:00 |
|
Niels Lyngsø
|
8030901184
|
Fix mistakes made in commit a4a6b77
|
2020-01-22 08:36:52 +01:00 |
|
Bjarke Berg
|
b84961bcbc
|
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
|
2020-01-22 07:06:43 +01:00 |
|
Shannon Deminick
|
656585b2dc
|
Merge pull request #7438 from umbraco/netcore/feature/AB4385-move-content-apps-to-abstractions
Netcore: Move content apps to abstractions
|
2020-01-22 12:43:56 +11:00 |
|
Benjamin Carleski
|
ae25845f2b
|
Correct cut-and-paste error
|
2020-01-21 17:40:13 -08:00 |
|
Benjamin Carleski
|
fd3ef48367
|
Use dependency injection for config classes
|
2020-01-21 17:25:03 -08:00 |
|
Shannon Deminick
|
3fa969eef2
|
Merge pull request #7400 from bielu/allow-override-internalsearch-constants
Add possibility to override internal hardcoded configs for backoffice search
|
2020-01-22 11:18:32 +11:00 |
|
Sebastiaan Janssen
|
163c1f7028
|
Fix automatic merge gone wrong
|
2020-01-21 19:16:07 +01:00 |
|
Sebastiaan Janssen
|
a4a6b77fc1
|
Merge branch 'v8/contrib' into v8/dev
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
|
2020-01-21 18:58:03 +01:00 |
|
elitsa
|
1bf1a86f94
|
Commenting out the Starter Kit installation for now as it isn't compatible
|
2020-01-21 15:41:35 +01:00 |
|
Bjarke Berg
|
f95b99676a
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4385-move-content-apps-to-abstractions
|
2020-01-21 14:29:27 +01:00 |
|
Bjarke Berg
|
17ee7796f4
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4635-move-cache-refreshers
|
2020-01-21 14:24:53 +01:00 |
|
Bjarke Berg
|
258dcef773
|
Merge pull request #7460 from umbraco/netcore/feature/AB4549-Move-models-from-web
Netcore: Move models from web to abstractions and infrastructure
|
2020-01-21 14:22:20 +01:00 |
|
elitsa
|
9ef5f74d67
|
Removing unnecessary namespace from in-line file reference
|
2020-01-21 13:50:37 +01:00 |
|
elitsa
|
bda64d75ba
|
Removing the usage of Current
|
2020-01-21 13:47:21 +01:00 |
|
Bjarke Berg
|
0cdd6ba29d
|
AB4635 - Moved CacheRefreshers to abstractions
|
2020-01-21 13:40:23 +01:00 |
|
Bjarke Berg
|
f3107c6f55
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4385-move-content-apps-to-abstractions
|
2020-01-21 11:07:42 +01:00 |
|
Bjarke Berg
|
68e3fe275a
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web
# Conflicts:
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/PackageInstallController.cs
|
2020-01-21 11:05:48 +01:00 |
|
Bjarke Berg
|
928f774bfd
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-01-21 10:51:43 +01:00 |
|
Bjarke Berg
|
d533631dff
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-01-21 10:51:36 +01:00 |
|
Bjarke Berg
|
bdf29f315f
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev
|
2020-01-21 10:51:16 +01:00 |
|
Bjarke Berg
|
d7377bd9b4
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DataTypeController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
|
2020-01-21 10:51:04 +01:00 |
|
Bjarke Berg
|
3978ad95df
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DataTypeController.cs
# src/Umbraco.Web/Editors/MacrosController.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
|
2020-01-21 10:50:26 +01:00 |
|