Shannon d9ac529e7e Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 ...

Conflicts:
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
	src/Umbraco.Web/WebServices/CoreStringsController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs

2014-04-24 16:33:04 +10:00

..

MembersMembershipProvider.cs

Fixes new membership providers to ensure no sql is run on init. Fixes the installer useLegacyEncoding setup to not attempt to set this when the legacy provider is enabled.

2014-02-26 02:57:05 +11:00

MembersRoleProvider.cs

Fixes issue with @ symbols in login name and a member group query

2014-02-12 18:02:00 +11:00

UmbracoMembershipProvider.cs

Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login

2014-04-24 16:26:21 +10:00

UsersMembershipProvider.cs

Fixes merge issues

2014-03-18 19:05:07 +11:00