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
|
3d55dcd3c4
|
Merge remote-tracking branch 'netcore/dev' into netcore/netcore
|
2020-08-26 08:05:15 +02:00 |
|
Shannon
|
9b991f3882
|
Fixes back office check, adds more tests, changes area to be a constant
|
2020-06-09 13:01:05 +10:00 |
|
Bjarke Berg
|
b2b0291386
|
Netcore: Migration of more controllers (#8220)
* https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Migrated DictionaryController, TinyMceController and UpdateCheckController
* Removing connection string and changing to use the right variable
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
|
2020-06-03 17:17:30 +02:00 |
|
Bjarke Berg
|
28c4f87236
|
https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImageUrlGeneratorController + Made usage some strings into the enums in the ImageUrlGenerationOptions
|
2020-05-20 17:39:07 +02:00 |
|
Bjarke Berg
|
0d65fccd52
|
https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6586 - Migrated ImagesController
|
2020-05-20 13:51:21 +02:00 |
|