Shannon deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs

2013-07-12 11:03:49 +10:00

..

Actions

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00

businesslogic

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00

helpers

Merge with 6.0.4

2013-04-06 01:23:29 +06:00

Properties

Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too.

2013-01-07 23:24:29 +03:00

ClassDiagram1.cd

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

packages.config

Updating nuget dependency for HtmlAgilityPack

2013-07-03 11:26:17 +02:00

PluginManagerExtensions.cs

Created PackageActionsResolver object to deal with IPackageAction plugins.

2012-08-01 23:03:26 +06:00

umbraco.cms.csproj

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

2013-07-12 11:03:49 +10:00