yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,896 Commits 4 Branches 7 Tags
49cfeee5b0ad59bd36790fdcd9f5dbc5fe6ca41a
Commit Graph

8896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
49cfeee5b0 Fixes: U4-3880 Custom parameter editor with JSON valueType 2014-01-09 12:49:33 +11:00
Shannon
01d09548aa fixed merge issues 2014-01-09 10:54:02 +11:00
Shannon
1ff049a063 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
 2014-01-09 10:38:31 +11:00
Shannon
7c720460f5 Fixes: U4-3876 MySQL cmsContentXml Migration Error on 7.0.1 Upgrade 2014-01-09 10:33:35 +11:00
Morten Christensen
d0c0ec56a4 Adding event handlers to the PackagingService 2014-01-08 14:13:16 +01:00
Morten Christensen
3c965e8c32 Updating relation event handlers 2014-01-08 14:13:15 +01:00
Morten Christensen
5bcd6a9982 Adding interface to PackagingService 2014-01-08 14:13:15 +01:00
perploug
525477f84f Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-08 13:27:42 +01:00
perploug
7d051dffbb adds editing function to media picker controller 2014-01-08 13:27:34 +01:00
perploug
c5a7eab1d5 WIP: adds cropper directive 2014-01-08 13:27:04 +01:00
perploug
115c8b15fd updates jquery ui to 1.10.3 2014-01-08 13:26:34 +01:00
Morten Christensen
29c8f065f7 Implementing Saving/Saved and Deleting/Deleted events for Relations and RelationTypes. 
Fixes U4-3992 RelationService doesnt have any events.
 2014-01-08 12:52:55 +01:00
Shannon
961755336a adds another test for #U4-3876 2014-01-08 20:34:20 +11:00
Shannon
e0aff8a1e4 adds a unit test 2014-01-08 20:25:35 +11:00
Shannon
6fa0c627a5 working on #U4-3876 2014-01-08 20:19:08 +11:00
Shannon
b3c2574aac working on #U4-3876 2014-01-08 20:04:26 +11:00
Shannon
98b2320421 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Tests/TreesAndSections/SectionTests.cs
 2014-01-08 18:41:01 +11:00
Shannon
66a63b3cbb ignores these tests for now, they are successful when running isolated but as a whole they don't pass because of something with the legacy data layer. 2014-01-08 18:39:37 +11:00
Shannon
077f3468b9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2014-01-08 18:20:49 +11:00
Shannon
21c5b6fe02 fixes user lookup on legacy provider 2014-01-08 18:20:18 +11:00
Shannon
3274d873a9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
 2014-01-08 18:13:35 +11:00
Shannon
ffed85640d fixes provider user key issue 2014-01-08 18:12:07 +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
cdbf89ee57 Fixes up the unit tests 2014-01-08 17:08:13 +11:00
Shannon
056b13eb98 fixes up the double member creation in the createuser method 2014-01-08 16:29:09 +11:00
Shannon
e2a395e245 Fixes merge issues 2014-01-08 16:09:35 +11:00
Shannon
6b760dcfe8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Membership/EntityPermission.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/PermissionRepository.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/UserServiceTests.cs
 2014-01-08 15:47:53 +11:00
Shannon
5ded732188 fixing some merge issues 2014-01-08 15:43:58 +11:00
Shannon
9467a67661 Backports the permissions repo updates, permissions on user/content repo updates and default permissions for users 2014-01-08 15:42:49 +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
96e00bc1eb moves classes to sep files 2014-01-08 14:04:30 +11:00
Shannon
0f9f11bbcf re-internalizes some classes for now 2014-01-08 14:03:10 +11:00
Shannon
5b6cc51516 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-08 13:04:01 +11:00
Shannon
80b83ab64b Fixes up password changer on postback, fixes up more of the edit user and edit member pages. 2014-01-08 13:03:33 +11:00
Shandem
326d81286a Merge pull request #281 from Jeavon/U4-3987 
Fixes U4-3987- Related Links
 2014-01-07 15:47:16 -08:00
Jeavon Leopold
13641473d0 Fixes U4-3987- Related Links 2014-01-07 14:40:45 +00:00
Morten Christensen
c6751f0374 Correcting the legacy template MakeNew private method so the OnNew event is fired after the design is added and file is created. 2014-01-07 13:24:05 +01:00
Morten Christensen
d71c686aea Typo or missing update in legacy User class 2014-01-07 13:23:03 +01:00
Morten Christensen
4c5dfb42d5 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-01-07 13:13:38 +01:00
Shannon
0245efe3cb Fixes the change password dashboard to work properly. Fixes the EditUser to property save the member and the user. Adds new (probably temporary) MembershipHelper which is used to update a MembershipUser. Updates the User model to ignore the membership properties that we currently cannot persist. Ensures the legacy User membership provider still looks for a typed membership user (which should never have happened). Fixes small issue with underlying membership provider trying to encrypt an empty string. 2014-01-07 17:01:22 +11:00
Shandem
b3151ca788 Merge pull request #280 from AndyButland/wip-u4-3980 
Fix to SQL on inserting tags to handle tag with apostrophe (U4-3980)
 2014-01-06 15:59:09 -08:00
AndyButland
aa1edb6e69 Fix to SQL on inserting tags to handle tag with apostrophe 2014-01-06 21:56:10 +01:00
Shannon
0b4ddf82aa Adds more user service tests 2014-01-06 17:43:29 +11:00
Shannon
3ff173732b implements the remaining incomplete parts of the UserService, adds more unit tests 2014-01-06 17:30:08 +11:00
Shannon
f3f7aa70d1 Ensures a default member/user type is assigned on membership provider initialize, adds more unit tests 2014-01-06 16:18:25 +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
c3a6c7c473 fixes up more of the legacy user membership provider 2014-01-06 14:02:09 +11:00
Shannon
5538a2e793 fixed up the failing unit tests for member service counts, added more unit tests for UserService and implemented more of the required methods. 2014-01-06 12:25:14 +11:00
Shannon
1b7dc76df2 Updated much more of the UserService + some unit tests 2014-01-06 11:56:53 +11:00
Shannon
85c85cd1eb Simplifies and streamlines the models used between IMember and IUser along with the services used for both of these entities. 
Updates the model used to store and retreive permissions, instead of a single string it is an Enumerable<string> which gives us some flexibility in the future and since this was not public (yet) it's the perfect time to do this.
Removes the base Profile classes from User since these are not required, since we cannot share base classes between Member and User, these weren't necessary.
 2014-01-06 11:04:26 +11:00