Bjarke Berg
|
3d55dcd3c4
|
Merge remote-tracking branch 'netcore/dev' into netcore/netcore
|
2020-08-26 08:05:15 +02:00 |
|
Bjarke Berg
|
c57c42d2ec
|
Fixes merge conflicts
|
2020-08-07 14:00:56 +02:00 |
|
Bjarke Berg
|
39162f0f6a
|
Merge conflicts resolved
|
2020-08-06 12:59:21 +02:00 |
|
Bjarke Berg
|
adb38dceb5
|
Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers
|
2020-06-28 14:00:26 +02:00 |
|
Bjarke Berg
|
9d639a64b3
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.Core/Templates/IUmbracoComponentRenderer.cs
# src/Umbraco.Web.BackOffice/Controllers/MacroRenderingController.cs
# src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
|
2020-06-28 13:35:25 +02:00 |
|
Bjarke Berg
|
2ffb01530a
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
# src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web/Compose/AuditEventsComponent.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/HtmlStringUtilities.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
|
2020-06-28 12:48:19 +02:00 |
|
Bjarke Berg
|
1a05feac02
|
Clean up
|
2020-06-25 15:23:11 +02:00 |
|
Bjarke Berg
|
1594a84d80
|
migated remaining backoffice controllers
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-06-22 10:08:08 +02:00 |
|
Shannon Deminick
|
a7a463c7d4
|
Merge pull request #8183 from umbraco/netcore/feature/identity
Back office identity changes and cookie authentication
|
2020-06-03 12:55:57 +10:00 |
|
Bjarke Berg
|
dca04b3dd7
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
# src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
# src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
# src/Umbraco.Web/Models/Trees/MenuItemList.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Trees/RelationTypeTreeController.cs
# src/Umbraco.Web/UmbracoApplication.cs
|
2020-05-29 12:59:42 +02:00 |
|
Shannon
|
8134a35fe0
|
Moves ContentType, MemberType, MediaType, etc... less casting, less internals
|
2020-05-20 11:59:41 +10:00 |
|
Bjarke Berg
|
3c622905ba
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
|
2020-05-11 08:23:59 +02:00 |
|
Bjarke Berg
|
cb0994a929
|
Cleaned up config for Security settings
|
2020-03-12 14:36:25 +01:00 |
|
Bjarke Berg
|
402867f115
|
Moved lots of mapping files
|
2020-02-17 09:15:48 +01:00 |
|
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
|
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
|
9fa18fe9a3
|
AB4549 - Moved more models
|
2020-01-20 15:20:21 +01:00 |
|
Bjarke Berg
|
5a67e5b395
|
AB4549 - Moved more models
|
2020-01-20 11:37:19 +01:00 |
|
Bjarke Berg
|
1e5c00878b
|
AB4549 - Moved models from web to abstractions and infrastructure
|
2020-01-15 09:05:52 +01:00 |
|