yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,796 Commits 4 Branches 7 Tags
2936ff0bf9cc6553d04fdb8ad18d21e5bdb36ffa
Commit Graph

712 Commits

Author SHA1 Message Date
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
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
2dd04799b2 WIP membership provider updates 2013-12-19 18:33:25 +11:00
Shannon
a5828a2c3e Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
 2013-12-19 15:59:50 +11:00
Shandem
063f405a06 Merge pull request #230 from Yawka/U4-2772 
U4 2772
 2013-12-18 20:51:17 -08:00
Shannon
662dfb37d3 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-12-18 18:11:56 +11:00
Shannon
ef4246478d Fixes: U4-2294 6.1.0: umbracoServer table can't be created on MySQL <5.6.5 2013-12-18 15:30:40 +11:00
Shannon
137d859532 backports missing logic and tests from 7 that I overlooked. 2013-12-17 16:13:38 +11:00
Shannon
d6d80ae037 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-17 16:03:27 +11:00
Shannon
b270cefacc Upgrading member repositories and services with tests 2013-12-17 14:53:21 +11:00
Shannon
8b064fc2ec Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
 2013-12-17 12:39:45 +11:00
Shannon
b4e984fe6a adds/updates unit tests for member and member type repository 2013-12-17 12:38:11 +11:00
Shannon
1a3339d485 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
 2013-12-17 11:42:50 +11:00
Shannon
ee8050f38f Fixes ContentTypeBase event assignment issue - an event handler was added for every property type added - that was not correct. 2013-12-17 11:35:56 +11:00
Shannon
e29031a2c4 Back ported relationship repo/service updates 2013-12-16 18:44:11 +11:00
Shannon
7e6fdcb05e back ported template repo and file service updates 2013-12-16 18:10:44 +11:00
Shannon
2ce952bdbb backports data type service updates and fixes unit tests with correct seeding value. 2013-12-16 17:17:23 +11:00
Shannon
060e584503 backported IContentService updates 2013-12-16 15:57:59 +11:00
Shannon
b86cddda94 fixes up unit tests 2013-12-16 13:55:46 +11:00
Shannon
a42b660648 Backporting the cachehelper and associated cache classes. 2013-12-16 13:19:10 +11:00
Shannon
751ace1168 Merge branch '6.2.0-membershipprovider' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-13 17:17:24 +11:00
Shannon
1ac6f6db50 publicizes macroproperty 2013-12-02 13:30:08 +11:00
Shannon
6fd5eee4f6 Fixes: U4-3591 Creating PropertyValueConverter for a v7 prop editor (created with manifest) ends up with YSOD when outputting value on frontend 2013-11-21 16:39:21 +11:00
Stephan
a626eeff7d U4-3591 - more explicit exception when two IPropertyValueConverter collides 2013-11-20 09:58:28 +01:00
Shannon
d3b8ac31c7 Fixes up a bunch of failing tests with hard coded ids. Still need to fix a few more 2013-11-19 15:36:30 +11:00
Shannon
2f42fc61bf Changed method signatures of some of the conversion methods on the PropertyValueEditor to make it more flexible for developers to do what they want. 2013-11-19 11:51:01 +11:00
Shannon
89b20a2e77 Updates installer to not install the legacy 'Media Picker' by default and instead install the newer "Multiple Media Picker" which has been given new ids. 2013-11-19 10:11:39 +11:00
Shannon
4d31512ef0 Custom membership provider's now working in the back office UI - have created intial functionality to allow custom properties with custom membership providers (the creation already performs the link if the Member member type is available). Updating also works too, need to clean up some code though as it's fairly messy. 2013-11-18 14:25:08 +11:00
Shannon
b4c005c140 Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that. 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
 2013-11-15 14:53:26 +11:00
Shannon
34cebe989f Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that. 2013-11-15 14:29:34 +11:00
Shannon
9e8286bda9 Adds ability to query the template tree (hierarchy) with the template repository + unit tests. 2013-11-13 10:59:36 +11:00
Shannon
2129ac8241 Adds template repository tests, updates template repo business logic to be able to delete the whole template tree, updates some script repo tests too. 2013-11-12 22:28:43 +11:00
yawka
807df434f6 Add validation for regular expression property 2013-11-07 18:39:02 +02:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
Shannon
bacdcb7abf updates some more logic when saving macro properties to always try to map to the new ones if legacy aliases are used. 2013-11-07 16:07:08 +11:00
perploug
f342b80e86 Fixes installer issue on CE 2013-11-04 14:56:56 +01:00
Shannon
c1f35e6991 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-11-01 09:07:04 +11:00
Stephan
767719357e U4-3279 - better exception message when failing to find a content type 2013-10-31 18:28:49 +01:00
Shannon
523c48d4fd Nearly have send to publish working, it's all wired up in the UI to the controller, just need to implement the logic. 2013-10-31 18:17:30 +11:00
Shannon
dc4a0fec80 Merge branch '6.2.0' into 6.2.0-membershipprovider 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-31 11:36:04 +11:00
Shannon
fea90482b6 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web/Standalone/StandaloneBootManager.cs
	src/Umbraco.Web/UmbracoContext.cs
 2013-10-28 11:26:01 +11:00
Stephan
89c5d5d613 PublishedContent - get published properties to report the CLR type of the value 2013-10-28 01:09:34 +01:00
Stephan
c66d49dbfe PublishedContent - remove useles code in model factory 2013-10-28 01:07:17 +01:00
Shannon
716def8d33 Completes: U4-3020 Installning package with legacy data types just gives error 2013-10-25 16:28:46 +11:00
Shannon
36ffd41007 Updates data type service for the way it saves pre-values so we can maintain ids if necessary - updates the pre-value editors to except a different dictionary which includes an id if necessary. This all fixes: U4-2751 Check that when publishing keys for drop down list prop eds that if we change a value that the id remains constistent 2013-10-24 16:38:00 +11:00
Shannon
c03b839bb1 Completes: U4-3052 Create TagsService 2013-10-24 11:49:09 +11:00
Shannon
865d8e633e Created a json converter so we don't have to use DarkMagic - this is based on a new "JSON" value type that is applied to a property editor. 2013-10-23 20:27:48 +11:00
Shannon
90c76ae465 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-22 13:45:23 +11:00
Shannon
680a4b9570 Fixes a lot - 
U4-3208 Ensure all membership provider properties exist on the default Member type shipped with Umbraco
U4-3158 user back office password policies doesn't adhere to membership provider rules
and even more fixes to the membership provider like actually integrating the last locked out date and last pword change date. Fixes member creation to actually use the membership provider - this means that the password is created properly based on the provider config. Fixes the provider to have default fields specified so people don't actually have to specify in config.
 2013-10-22 13:41:04 +11:00