Bjarke Berg 58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core ...

# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs

2020-01-07 09:46:42 +01:00

..

config

Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core

2020-01-07 09:46:42 +01:00

Content

Port 7.7 - WIP

2017-09-08 19:39:13 +02:00

Media

Normalises whitespace (replace tabs) and add EOF line

2017-10-05 19:17:06 +01:00

Properties

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Umbraco

Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core

2020-01-07 09:46:42 +01:00

Views

Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure

2020-01-06 14:59:17 +01:00

favicon.ico

Merge branch 'v7/dev' into v8/dev

2019-04-17 14:35:59 +02:00

Global.asax

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

Umbraco.Web.UI.csproj

Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure

2020-01-06 14:59:17 +01:00

web.Template.config

kill user membership provider, adds some passwords api abstractions, moves membership provider logic out of Core/services, removes membership scenario and other membership code we don't want anymore.

2019-11-25 21:20:00 +11:00

web.Template.Debug.config

kill user membership provider, adds some passwords api abstractions, moves membership provider logic out of Core/services, removes membership scenario and other membership code we don't want anymore.

2019-11-25 21:20:00 +11:00

web.Template.Release.config

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00