Umbraco-CMS

Files

Shannon b8fe5df3c9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web.UI/config/feedProxy.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/config/xsltExtensions.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

2014-02-25 02:24:45 +11:00

members

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-25 02:24:45 +11:00

Properties

Fixes lots of membership provider stuff

2013-10-17 20:20:43 +11:00

SecUtility.cs

Refactoring MemberService and MembersMembershipProvider from Darrens pull request to fit the changes made the past week.

2013-09-04 15:42:01 +02:00

umbraco.providers.csproj

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2