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

..

Extensions

U4-1212 - can publish grand-child of unpublished node

2012-11-17 14:37:41 -01:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

SqlHelpers

upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct

2013-05-27 01:23:49 -10:00

Utility

datalayer - remove mess introduced in f312bd7ee03b

2013-02-05 14:36:56 -01:00

DataLayerHelper.cs

Additional fixes for U4-1845 to maintain compatibility for people using the

2013-03-06 14:09:01 -01:00

IParameter.cs

Cleaning up folder structure (U4-56)

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

IParameterContainer.cs

Cleaning up folder structure (U4-56)

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

IRecordsReader.cs

Cleaning up folder structure (U4-56)

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

ISqlHelper.cs

U4-1212 - can publish grand-child of unpublished node

2012-11-17 14:37:41 -01:00

packages.config

Updating MySql package dependency

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

RecordsReaderAdapter.cs

Cleaning up folder structure (U4-56)

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

SqlHelper.cs

datalayer - remove mess introduced in f312bd7ee03b

2013-02-05 14:36:56 -01:00

SqlHelperException.cs

Cleaning up folder structure (U4-56)

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

SqlParameterAdapter.cs

Cleaning up folder structure (U4-56)

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

SqlParser.cs

Cleaning up folder structure (U4-56)

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

StringExtensions.cs

Cleaning up folder structure (U4-56)

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

umbraco.datalayer.csproj

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

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

UmbracoException.cs

Cleaning up folder structure (U4-56)

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