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

..

splashes

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

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

404handlers.config

added Umbraco.Web.UI containing only web rendering files

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

404handlers.Release.config

added Umbraco.Web.UI containing only web rendering files

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

applications.config

Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons

2013-07-04 12:50:25 +10:00

applications.Release.config

Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons

2013-07-04 12:50:25 +10:00

BaseRestExtensions.config

fix config files for BaseRestExtension.config

2012-10-06 07:20:12 -02:00

BaseRestExtensions.Release.config

fix config files for BaseRestExtension.config

2012-10-06 07:20:12 -02:00

ClientDependency.config

Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations.

2013-07-02 17:47:20 +10:00

ClientDependency.Release.config

re-enables CDF logger

2013-06-21 10:55:38 +10:00

Dashboard.config

Temp removes uGoLive since the old TypeFinder isn't there anymore.

2013-06-09 06:19:08 -02:00

Dashboard.Release.config

Fix missing Examine dashboard

2013-05-30 10:26:54 -02:00

EmbeddedMedia.config

Embed classes internal -> public.

2012-09-06 15:23:42 -02:00

EmbeddedMedia.Release.config

Embed classes internal -> public.

2012-09-06 15:23:42 -02:00

ExamineIndex.config

Merge with 6.0.1

2013-02-26 21:42:55 +06:00

ExamineIndex.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

ExamineSettings.config

Update to latest examine (bug fixed), started Examine Management dashboard FF project.

2013-02-23 23:00:31 +06:00

ExamineSettings.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

feedProxy.config

added Umbraco.Web.UI containing only web rendering files

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

feedProxy.Release.config

added Umbraco.Web.UI containing only web rendering files

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

FileSystemProviders.config

Fixes PhysicalFileSystem to use IOHelper instead of HostingEnvironment. Removes all references to new IFileSystem's that canont be supported currently, leaving only the media file system.

2013-01-14 03:04:09 +03:00

FileSystemProviders.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00

log4net.config

Added App_Code assembly loading to new type finder, had to recompile log4net to support medium trust.

2012-08-04 06:07:29 +06:00

log4net.Release.config

Added Log4Net and supporting classes from v5 in order to start integration of new diagnostic logging system.

2012-07-28 01:28:39 +06:00

metablogConfig.config

Fixes: U4-2577 Can't save umbraco user - without re-filling in the password

2013-08-02 15:16:04 +10:00

metablogConfig.Release.config

added Umbraco.Web.UI containing only web rendering files

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

restExtensions.config

Committing configs with correct spacing

2012-12-05 12:37:21 -01:00

restExtensions.Release.config

fix BaseRest config management - would throw when missing config files

2012-11-01 16:46:04 -01:00

scripting.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

scripting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

Skinning.config

added Umbraco.Web.UI containing only web rendering files

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

Skinning.Release.config

added Umbraco.Web.UI containing only web rendering files

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

tinyMceConfig.config

Fixed some attributes in tinyMCEConfig.config U4-717 and U4-1006

2012-10-25 09:02:33 -02:00

tinyMceConfig.Release.config

Update the tinyMCE release config as well for U4-717 and u4-1006

2012-10-31 10:11:02 -01:00

trees.config

Got the media tree converted to new tree structure.

2013-08-05 19:22:00 +10:00

trees.Release.config

Got partial view tree and partial view macros tree done. Need to get the custom create dialogs done now.

2012-12-31 02:51:30 +03:00

umbracoSettings.config

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

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

umbracoSettings.Release.config

defaultDocumentTypeProperty is no longer case-sensitive. Added to the Release config as well so it makes it into the umbraco downloadable package.

2013-07-19 15:41:29 +02:00

UrlRewriting.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

UrlRewriting.Release.config

Updating nuspec files and build

2013-06-27 15:15:27 +02:00

xsltExtensions.config

Adds Examine xslt extensions to config by default.

2013-02-02 03:49:16 +06:00

xsltExtensions.Release.config

Config file formatting, remove logger from CD for now as it was throwing errors

2013-05-30 08:47:17 -02:00