swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,905 Commits 73 Branches 219 Tags
94de454264dda5ad3b16012fe2e3c82059e0cd3c
Commit Graph

1156 Commits

Author SHA1 Message Date
Shannon 94de454264 Fixing unit tests 2013-11-04 17:24:25 +11:00
Shannon e4bd459da4 Completes: U4-2666 Change the drop down for selecting an icon/thumbnail for doc/media types to display the new list of icons to choose from 2013-11-01 17:18:57 +11:00
Shannon ab6a26445e Fixed the horrible mess that was the permissions editor dialog. 2013-10-31 12:57:41 +11:00
Shannon 881dab1612 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-31 11:47:50 +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 4c3d700c54 Changes the UserMembershipProvider to validate an already hashed/encrypted password and then validate a non hashed/encrypted attempt, this is to maintain compatibility with how v6 works, it's not ideal but needs to be there. Creates a settable property on the password changer to be able to dynamically hide the old password field if you are going to manually set the old password. Updates the EditUser to hide the old password field and pass in the alraedy encrypted pword to validate against like it used to be. 2013-10-31 11:35:12 +11:00
Shannon e862ffcb1b Fixes: U4-3266 Xml cache file is not created/persisted 2013-10-29 15:43:10 +11:00
perploug fc2e605fd8 Improves the property safe alias lookup 2013-10-28 22:57:57 +01:00
perploug 0aab5e435a Adds a way to do hotkys on webforms buttons 2013-10-28 21:32:35 +01:00
Shannon 3110b199c6 Completes: U4-3155 Ensure new tree events are fired for legacy trees 2013-10-28 13:45:38 +11:00
Shannon ecf73a6230 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web/Mvc/UmbracoViewPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-28 11:03:14 +11:00
Shannon a915dff4a8 Fixes packaging service up to export data type's properly, fixes legacy DataTypeDefinition to export data type's properly with the prop ed alias instead of id, obsoletes old content extension methods. 2013-10-28 11:02:04 +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 2587b06361 WIP - Fixing up the package installer to detect incompatible legacy data types, dlls, etc... and cleaning up some of the old code in there. 2013-10-24 19:50:46 +11:00
Shannon e507ad4ace Removes IActionHandler - and all it's references : U4-3226 Remove IActionHandler 2013-10-24 17:15:37 +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
perploug d82fd3dd04 member groups tree and editor polish 2013-10-22 14:58:42 +02: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
perploug 35a03a1e58 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-21 14:29:19 +02:00
perploug 2a9a7ee9c5 removes legacy js 2013-10-21 14:28:23 +02:00
perploug 652f1e52ec listview selection css 2013-10-21 14:26:26 +02:00
Shannon 39eb0351c0 Completes U4-3086 Remove EditMember.aspx 2013-10-21 17:29:13 +11:00
Jeremy Pyne ba6ba15732 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.1.3-clean 2013-10-18 11:37:28 -04:00
Jeremy Pyne 291f526368 Fix to properly read actions from trees.config. 2013-10-18 11:37:06 -04:00
Shannon a663cad110 Fixes styling on passwordChanger to be inline with Belle styles 2013-10-18 11:55:53 +11:00
Shannon e0c1b5cd8d Fixes merge issues 2013-10-18 11:39:51 +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 92c7b4446b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AddChangeDocumentTypePermission.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
 2013-10-18 11:27:32 +11:00
Shannon 5d5f7a4516 Updated edit member with correct usage of password changer. 2013-10-18 08:52:46 +11:00
Shannon 61ef83c748 Gets the password changer working - on the edit user page. reset/change password wth validation 2013-10-18 00:37:51 +11:00
Shannon f82329b371 More updates the password changer and edit user 2013-10-17 22:52:37 +11:00
Shannon 0fee434ac2 Working on the password changer control to present the correct inputs based on the membership provider given.... nearly there. 2013-10-17 22:40:38 +11:00
Shannon 3aab41b1e4 Fixes lots of membership provider stuff 
U4-3057 MembershipPasswordFormat problem at EncodePassword method in UmbracoMembershipProvider class
U4-3176 UsersMembershipProvider.CreateUser does not encrypt/hash the password
U4-3173 UserMembershipProvider.ChangePassword does not work

- Now we need to update the UI for the member

Signed-off-by: Shannon <sdeminick@gmail.com>
 2013-10-17 20:20:43 +11:00
perploug 100ab5643a Localizing cotnent and media editors main grid 2013-10-16 20:37:12 +02:00
Shannon 0312b947e1 Fixes template editor to re-enable ajax saving - might need back porting to 6.2 2013-10-15 15:38:08 +11:00
Shannon df25edfaf6 Fixes: U4-2928 Packages tree shows context menu for items that shouldn't have one + other issues with legacy trees and menus 2013-10-14 15:36:17 +11:00
Shannon af43b35d17 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-14 10:46:06 +11:00
Shannon 72ea43758d Fixes - U4-3119 Non-Admin Users Cannot Create or Edit Users regardless of permission settings - 6.1.6 2013-10-14 10:45:51 +11:00
Stephan 7718adfca1 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 11:11:18 +02:00
perploug e67f85695c fixes U4-3054 icon picker viewstate 2013-10-10 19:47:12 +02:00
Stephan 8a8b09141f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-10 16:15:23 +02:00
perploug 1e6b80e45e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
 2013-10-09 15:10:51 +02:00
perploug 31d3b88a5b dictionary tree icons 2013-10-09 15:07:17 +02:00
perploug d7b732ba4b working clientside localization 2013-10-09 15:05:05 +02:00
Shannon 3c38b335a6 Converts DlrScripting & xslt to the correct webforms structure. 2013-10-09 12:07:50 +11:00
Shannon d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-09 11:12:33 +11:00
perploug a2ebb1b06f support for loading actions directly from search results 2013-10-08 15:04:47 +02:00
Stephan 31535e3bd8 Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-08 11:21:38 +02:00