Shannon 24e2547656 Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b ...

# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs

2017-05-04 18:29:43 +10:00

..

App_Browsers

…

App_Plugins/ModelsBuilder

move dashboard from App_Plugins to dashboards folder

2016-08-05 12:36:10 +02:00

config

Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b

2017-05-04 18:29:43 +10:00

Media

U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS

2016-06-28 16:01:23 +02:00

Properties

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco

Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b

2017-05-04 18:29:43 +10:00

Umbraco

remove unnecessary break from language file

2017-04-20 11:02:49 +02:00

umbraco_client

U4-9160 Headline in the "Republish entire site" dialog is not translated

2016-11-08 10:53:29 +01:00

Views

U4-9262 CleanForXss breaks rgba() values set as grid background color style

2016-12-20 13:27:53 +11:00

default.aspx

…

Global.asax

WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility.

2014-12-11 15:58:54 +11:00

packages.config

Fix broken refs to some libs

2017-04-24 10:50:25 +02:00

Umbraco.Web.UI.csproj

Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b

2017-05-04 18:29:43 +10:00

Umbraco.Web.UI.csproj.DotSettings

Makes sure that R# doesn't suggest C#6 features

2015-07-24 17:25:52 +02:00

web.Template.config

Reverts CodeAnalysis update to stay compatible with Models builder

2017-04-10 13:45:34 +02:00

web.Template.Debug.config

Reverts CodeAnalysis update to stay compatible with Models builder

2017-04-10 13:45:34 +02:00

web.Template.Release.config

U4-6566 Membership provider useLegacyEncoding should default to false

2017-03-14 17:05:24 +01:00