Sebastiaan Janssen
|
db22dfcf7d
|
#U4-5337 fixed Due in version: 7.1.5,6.2.2
Too easy to lock yourself out of the backoffice
|
2014-08-12 11:05:25 +02:00 |
|
Shannon
|
f3c7533796
|
Potentially fixes U4-5069 Deadlock occurring in MemberService.GetByUsername
|
2014-07-01 10:43:44 +10:00 |
|
Shannon
|
ac88da4188
|
Fixes: U4-4856 ApplicationContext.Current.Services.ContentService.Save throw exception
|
2014-05-12 14:32:34 +10:00 |
|
Shannon
|
d264792e18
|
Fixes: U4-4819 Publicize AuthenticationExtensions
|
2014-05-06 18:15:38 +10:00 |
|
Shannon
|
e0c3eda675
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/Models/PropertyExtensions.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Security/MembershipProviderBase.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/MediaService.cs
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Tests/Models/DataValueSetterTests.cs
src/Umbraco.Web.UI/web.Template.config
src/umbraco.cms/businesslogic/media/Media.cs
src/umbraco.cms/businesslogic/member/Member.cs
|
2014-04-29 13:06:10 +10:00 |
|
Shannon
|
2f53698bc5
|
Fixes: U4-4766 UmbracoMembershipProvider.ChangePassword() is seal, what might be a breaking change?
|
2014-04-28 19:19:48 +10:00 |
|
Shannon
|
c32cae16db
|
Fixes: U4-4696 Macro personalized cache with custom membership provider not working - for any membership provider regardless of provider user key type
|
2014-04-24 12:14:06 +10:00 |
|
Shannon
|
e10e04aabf
|
Fixes: U4-4696 Macro personalized cache with custom membership provider not working - for any membership provider regardless of provider user key type
|
2014-04-24 12:12:06 +10:00 |
|
Shannon
|
4d13925e3b
|
Fixes merge issues
|
2014-03-18 19:05:07 +11:00 |
|
Shannon
|
02481dcfba
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
|
2014-03-18 18:53:04 +11:00 |
|
Shannon
|
caad775399
|
Removes the User membership provider name constant - it is not a constant, this value is configurable!
|
2014-03-18 18:52:17 +11:00 |
|
Shannon
|
fd14065f14
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
src/Umbraco.Core/Persistence/Factories/MemberFactory.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
src/Umbraco.Web/Controllers/UmbProfileController.cs
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
src/Umbraco.Web/Security/WebSecurity.cs
src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
|
2014-03-18 18:47:49 +11:00 |
|
Shannon
|
8dd950bd52
|
Ensures all access to the users membership provider is done with our extension method
|
2014-03-18 17:22:25 +11:00 |
|
Shannon
|
e2881e07d1
|
Ensures that all calls to the members membership provider are done so explicitly with the membership provider alias - this decouples the need to have the umbraco membership provider declared as the default, we were doing both before.
|
2014-03-18 17:08:21 +11:00 |
|
Shannon
|
3c3f2d7c8d
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Constants-Conventions.cs
src/Umbraco.Core/DateTimeExtensions.cs
src/Umbraco.Core/Models/PropertyType.cs
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Tests/App.config
src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
src/Umbraco.Tests/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/app.config
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/umbraco.MacroEngines/App.Config
src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2014-02-21 16:32:53 +11:00 |
|
Shannon
|
c677f36f08
|
Changes some of the naming conventions for the underlying membership provider services bits.
|
2014-02-21 16:03:32 +11:00 |
|
Shannon
|
8da2c22a4e
|
removes special default password check, this is no longer necessary.
|
2014-02-20 14:38:56 +11:00 |
|
Shannon
|
8154382fb1
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2014-02-17 13:17:19 +11:00 |
|
Shannon
|
10ef5eb7bc
|
adds new interface for members' membership providers to implement so we know what aliases to store data against.
|
2014-02-17 13:16:28 +11:00 |
|
Shannon
|
c4acbf0dbc
|
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs
src/Umbraco.Core/Constants-Conventions.cs
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/IUser.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Core/Persistence/RepositoryFactory.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/IMemberTypeService.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/IUserService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/MemberTypeService.cs
src/Umbraco.Core/Services/ServiceContext.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/MockTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Breadcrumb.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListAncestorsFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByDate.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByName.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesWithDoctype.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListDescendantsFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/MultinodeTree-picker.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Navigation.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/SiteMap.cshtml
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
src/Umbraco.Web.UI/config/umbracoSettings.config
src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
src/Umbraco.Web/Controllers/UmbLoginController.cs
src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
src/Umbraco.Web/Controllers/UmbProfileController.cs
src/Umbraco.Web/Controllers/UmbRegisterController.cs
src/Umbraco.Web/Models/LoginModel.cs
src/Umbraco.Web/Models/LoginStatusModel.cs
src/Umbraco.Web/Models/ProfileModel.cs
src/Umbraco.Web/Models/RegisterModel.cs
src/Umbraco.Web/Models/UmbracoProperty.cs
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
src/Umbraco.Web/Security/WebSecurity.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoModule.cs
src/Umbraco.Web/WebApi/UmbracoApiController.cs
src/Umbraco.Web/umbraco.presentation/library.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewMacrosTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
src/umbraco.businesslogic/User.cs
src/umbraco.providers/UsersMembershipProvider.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2014-02-13 16:22:51 +11:00 |
|
perploug
|
9687b2abee
|
Special rule for installer password change
|
2014-01-31 13:03:46 +01:00 |
|
Shannon
|
a272675ed8
|
Wraps the MemberService from the legacy Member object
|
2014-01-23 11:41:01 +11:00 |
|
Shannon
|
3f8b3031c2
|
completes: U4-3996 Fix EditUser to use the membership provider properly, U4-3997 Fix EditMember to use the membership provider properly
|
2014-01-22 11:57:33 +11:00 |
|
Shannon
|
8926e8c7d9
|
ensures preview cookie is gone on logout.
|
2014-01-16 20:56:34 +11:00 |
|
Shannon
|
f4b707e928
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/Security/AuthenticationExtensions.cs
src/umbraco.businesslogic/StateHelper.cs
|
2014-01-16 20:49:19 +11:00 |
|
Shannon
|
c38030def2
|
Fixes: U4-3855 Preview cookie should be a session cookie not persisted
|
2014-01-16 20:47:13 +11:00 |
|
Shannon
|
08c837602f
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Models/MemberType.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
|
2014-01-14 16:28:48 +11:00 |
|
Shannon
|
563867cd8b
|
Temp fix for: U4-3968 Umbraco 7.01 - Membership - Public Access - Add Single User protection - crash, fixes protectPage so that it uses the membership provider to make changes, updates the UI logic so that if you choose an existing user it will you about it, fixes it so you cannot arbitrarily change a member's password.
|
2014-01-14 16:21:00 +11:00 |
|
Shannon
|
86c66511dd
|
changes all calls from Member.InUmbracoMemberMode() to Membership.Provider.IsUmbracoMembershipProvider() and obsoletes the InUmbracoMemberMode
|
2014-01-14 14:17:28 +11:00 |
|
Shannon
|
250f082346
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Security/MembershipProviderBase.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Tests/TreesAndSections/SectionTests.cs
|
2014-01-08 17:12:06 +11:00 |
|
Shannon
|
056b13eb98
|
fixes up the double member creation in the createuser method
|
2014-01-08 16:29:09 +11:00 |
|
Shannon
|
d6a83d9887
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Models/IMember.cs
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/IUser.cs
src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
src/Umbraco.Core/Models/Membership/User.cs
src/Umbraco.Core/Models/Membership/UserProfile.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Factories/UserFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Tests/Services/UserServiceTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUserType.cs
src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/umbraco.businesslogic/User.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2014-01-08 14:32:38 +11:00 |
|
Shannon
|
cd82bc6d21
|
streamlined the new membership provider classes so now they all share the same logic and use IMembershipMemberService<T> which is used by both IMember and IUser services
|
2014-01-06 15:38:34 +11:00 |
|
Shannon
|
78336181ea
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Security/MembershipProviderBase.cs
src/Umbraco.Core/Services/IMemberService.cs
src/Umbraco.Tests/App.config
src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
src/Umbraco.Web.UI/config/tinyMceConfig.config
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/umbraco.controls/TabView.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
|
2014-01-02 15:28:42 +11:00 |
|
Shannon
|
17883358b6
|
Fixes some issues with the User membership provider, updates user create dialog to also have an email address (which is required by membership), adds validation to the member and user create dialogs to ensure that the email address is validated to be a correcty formatted address.
|
2014-01-02 14:13:43 +11:00 |
|
Shannon
|
fc0c6a1cd8
|
fixes stored password check with legacy encoding.
|
2013-12-31 13:27:47 +11:00 |
|
Shannon
|
8a70c440f2
|
Added many more unit tests for the membership provider base class and fixed some logic inconsistencies.
|
2013-12-28 18:55:43 +11:00 |
|
Shannon
|
edaa5ebd43
|
Lots more unit tests for the membership providers and some other fixups - have a new failing test as i need to sort out salting issue with encrypted passwords.
|
2013-12-24 14:03:18 +11:00 |
|
Shannon
|
414b65b269
|
More WIP on the membership providers - both new and old. They are now both working with the same up-to-date logic and base classes. Updated the interface definitions on the member services to support the membership provider queries - now to implement the logic.
|
2013-12-20 14:01:10 +11:00 |
|
Shannon
|
2dd04799b2
|
WIP membership provider updates
|
2013-12-19 18:33:25 +11:00 |
|
Shannon
|
9d90506265
|
Fixes issue with authcookie on renew - need to ensure its http only and persited for a day remains, ensures the csrf cookies are set when getting the user since that is called before logging in.
|
2013-12-03 11:57:41 +11:00 |
|
Shannon
|
ea35ea1af5
|
getting csrf stuff coded up, it's pretty much done just need to write a couple tests and add the filter to the necessary controller/actions
|
2013-12-02 17:20:50 +11:00 |
|
Shannon
|
48b3806129
|
adds umbraco session id to UserData so we can use for csrf
|
2013-11-29 12:42:50 +11:00 |
|
Per Ploug Krogslund
|
7440855c72
|
merge
|
2013-11-07 17:16:22 +01:00 |
|
Shannon
|
b2c5d7270e
|
Fixes: U4-3286 Using a custom aspx page that inherits from UmbracoEnsuredPage seems to log you out - moves the authentication/ticket logic to one central place, now for all base page validation requests if the ticket is not already there it will attempt to authentication the request. This only occurs when a page is being loaded that requires back office authentication but is not part of the umbraco back office route (so packages mainly)
|
2013-11-01 15:37:59 +11:00 |
|
Shannon
|
c5c1946d1b
|
Got more of the install checker working and inspecting package assemblies for report.
|
2013-10-25 11:35:09 +11:00 |
|
Shannon
|
00486eeaa7
|
Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
src/Umbraco.Web/Security/WebSecurity.cs
src/umbraco.providers/UsersMembershipProvider.cs
src/umbraco.providers/members/MembersMembershipProvider.cs
|
2013-10-23 10:51:06 +11:00 |
|
Shannon
|
ae32968efd
|
Updates the legacy membership providers and WebSecurity/Password changer to stay backwards compatible with their previous settings whilst still keeping all of the provider fixes.
|
2013-10-23 10:19:43 +11:00 |
|
Shannon
|
b95575572d
|
Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
src/Umbraco.Core/Models/Rdbms/UserDto.cs
src/Umbraco.Core/NameValueCollectionExtensions.cs
src/Umbraco.Core/Security/MembershipProviderBase.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Models/PasswordChangedModel.cs
src/Umbraco.Web/Security/WebSecurity.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/umbraco.cms/businesslogic/member/Member.cs
src/umbraco.providers/Properties/AssemblyInfo.cs
src/umbraco.providers/UsersMembershipProvider.cs
src/umbraco.providers/members/MembersMembershipProvider.cs
|
2013-10-18 11:33:38 +11:00 |
|
Shannon
|
40287fd427
|
adds some tests for membership provider base
|
2013-10-18 09:33:10 +11:00 |
|