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
..
2020-08-07 14:00:56 +02:00
2020-06-05 11:36:59 +02:00
2020-08-07 14:00:56 +02:00
2020-04-14 14:07:01 +01:00
2020-08-07 00:48:32 +10:00
2020-01-23 20:06:02 +11:00
2020-06-11 11:07:21 +02:00
2020-02-24 11:27:02 +01:00
2020-08-06 12:59:21 +02:00
2020-07-10 21:00:58 +02:00
2020-04-22 08:17:45 +02:00
2020-05-27 13:48:26 +10:00
2020-05-06 20:37:03 +02:00
2020-08-07 14:00:56 +02:00
2020-08-04 14:51:12 +10:00
2020-08-18 16:10:05 +02:00
2020-09-09 19:13:37 +02:00
2020-09-08 15:17:57 +02:00
2020-09-08 15:17:57 +02:00
2020-09-04 00:27:43 +10:00
2020-09-04 00:27:43 +10:00
2020-03-26 15:39:20 +11:00
2020-06-11 11:07:21 +02:00
2020-06-22 15:01:55 +02:00
2020-08-27 10:45:59 +02:00
2020-04-01 12:44:53 +02:00
2020-09-08 15:17:57 +02:00
2020-09-04 01:30:47 +10:00
2020-08-07 14:00:56 +02:00
2020-04-24 08:34:48 +02:00
2020-08-07 14:00:56 +02:00
2020-09-09 19:13:37 +02:00