Shannon 0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 ...

Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln

2013-08-07 10:29:34 +10:00

..

App_Browsers

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

App_Plugins

replaces scriptLoader references with assetsService

2013-08-05 14:16:04 +02:00

config

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

2013-08-07 10:29:34 +10:00

install

Implements real FormsAuthentication for back office cookie authentication... finally :)

2013-07-31 17:08:56 +10:00

Properties

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

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

umbraco

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

2013-08-07 10:29:34 +10:00

Umbraco/Images/pinnedIcons

Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

2013-07-15 16:31:19 +02:00

umbraco_client

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

2013-07-31 18:52:14 +10:00

Views

Fixing nuget related issue #U4-2067 and updating version

2013-04-22 06:01:31 -02:00

xslt

added web.config files to the root of xslt folders which will disable the ability for people

2013-05-12 19:29:05 -10:00

default.aspx

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

Global.asax

Moves app initialization into new UmbracoApplication (global.asax)

2012-07-20 22:02:28 +06:00

packages.config

Updated to latest CDF version which contains some fixes.

2013-07-22 11:29:32 +10:00

Umbraco.Web.UI.csproj

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

2013-08-07 10:29:34 +10:00

web.Template.config

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

2013-07-31 18:52:14 +10:00

web.Template.Debug.config

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

2013-07-31 18:52:14 +10:00

web.Template.Release.config

Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config

2013-06-21 16:20:18 +10:00