Bjarke Berg 58c70c3a90 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore ...

# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml

2020-05-29 13:02:27 +02:00

..

ContentEditing

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-05-29 12:59:42 +02:00

Editors

…

Mapping

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-05-29 12:59:42 +02:00

Membership

…

PublishedContent

…

BackOfficeTour.cs

…

BackOfficeTourFile.cs

…

BackOfficeTourStep.cs

…

Content.cs

…

ContentBaseExtensions.cs

…

ContentRepositoryExtensions.cs

…

ContentTagsExtensions.cs

…

ContentType.cs

…

ContentTypeBase.cs

…

ContentTypeCompositionBase.cs

…

ContentTypeImportModel.cs

…

DataType.cs

…

GridValue.cs

…

Language.cs

…

LocalPackageInstallModel.cs

https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Build fix

2020-05-27 12:38:53 +02:00

Macro.cs

Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests

2020-02-25 13:38:36 +01:00

Media.cs

…

MediaExtensions.cs

Cleaned up config for Content settings

2020-03-12 15:30:22 +01:00

MediaType.cs

…

Member.cs

…

MemberType.cs

…

ObjectTypes.cs

…

PathValidationExtensions.cs

…

Property.cs

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-03-26 19:22:09 +01:00

PropertyCollection.cs

…

PropertyTagsExtensions.cs

…

PropertyType.cs

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-03-10 08:25:43 +01:00

Template.cs

…

TemplateOnDisk.cs

…

UserExtensions.cs

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