Bjarke Berg
|
b729c44505
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# 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/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
|
2020-10-02 16:43:23 +02:00 |
|
Mole
|
3d52949938
|
Merge pull request #8944 from umbraco/netcore/bugfix/8856-user_culture_not_used_everywhere
Netcore: Bugfix for user culture not used everywhere
|
2020-09-23 09:58:30 +02:00 |
|
Bjarke Berg
|
a28168667b
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
# src/Umbraco.Core/Models/IconModel.cs
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
|
2020-09-22 13:28:03 +02:00 |
|
Bjarke Berg
|
02e3cc7c30
|
https://github.com/umbraco/Umbraco-CMS/issues/8856 - Aligned namespaces of controllers and also determine BackOfficeApiArea as backoffice
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
|
2020-09-22 11:07:01 +02:00 |
|
Bjarke Berg
|
e74570c0ac
|
More clean up of old configs
|
2020-09-14 14:12:38 +02:00 |
|
Bjarke Berg
|
459e730510
|
Fix issues after merge
|
2020-08-26 08:17:05 +02:00 |
|
Bjarke Berg
|
3d55dcd3c4
|
Merge remote-tracking branch 'netcore/dev' into netcore/netcore
|
2020-08-26 08:05:15 +02:00 |
|