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

7670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
c737c43fa2 Completes: U4-3169 Publicize new MacroService 2013-10-18 12:54:18 +11: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
844f4490fe Completes: U4-3168 Proxy legacy macro APIs to new MacroService 2013-10-18 11:24:53 +11:00
Shannon
e18b00ef25 Obsoletes legacy relation API 2013-10-18 10:39:00 +11:00
Shannon
3cef9d9186 csproj updates 2013-10-18 10:35:15 +11:00
Shannon
8188f66892 Implements: U4-3171 Create an interface for RelationService 2013-10-18 10:35:04 +11:00
Shannon
a87e699f8d Updates the web.config template to allow password reset 2013-10-18 09:54:34 +11:00
Shannon
40287fd427 adds some tests for membership provider base 2013-10-18 09:33:10 +11:00
Shannon
5d5f7a4516 Updated edit member with correct usage of password changer. 2013-10-18 08:52:46 +11:00
Shannon
ac6aaedf3e missing csproj commit to fix build 2013-10-18 08:34:37 +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
Shannon
e0e5aef43e 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
 2013-10-17 17:40:29 +11:00
Shannon
fd6046ebb6 The user change password dashboard now works and adheres to the membership provider rules. 2013-10-17 14:46:16 +11:00
Shannon
2a7844d031 Fixes more of U4-3174 UsersMembershipProvider.ResetPassword does not work 2013-10-17 13:55:01 +11:00
Shannon
dc0f4757a2 Fixes: U4-3174 UsersMembershipProvider.ResetPassword does not work, U4-3173 UserMembershipProvider.ChangePassword does not work 2013-10-17 13:44:21 +11:00
Shannon
d6bd3354cf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-17 11:29:04 +11:00
Shannon
e94f8da3e8 removes the macro renderings ref 2013-10-17 11:28:39 +11:00
Shannon
d28cdf3bdc Updates the formHelper and streamlines the way form submission is handled, updates the member and user controller to use the new change password functionality in the Security object which uses all of the correct logic to update a password based on the membership provider. Gets the user's change password form working correctly with server validation. now just need to get the user membership provider to actually work. 2013-10-17 11:28:21 +11:00
Shannon
1ac2ccb8c2 makes public the ApplicationTreeService on the services context 2013-10-17 11:26:34 +11:00
Shannon
3be2af15ee Removes ObjectExtensions from the config - this was left over from the importing of the new config. 2013-10-17 11:25:21 +11:00
perploug
aef7525354 localization and visual tweaking 2013-10-17 01:10:14 +02:00
perploug
eef44e97c5 user localization 2013-10-17 01:09:55 +02:00
perploug
1f65f02f49 dashboards localization 2013-10-17 01:09:46 +02:00
perploug
87cacaf92c touch padding 2013-10-17 01:09:32 +02:00
perploug
b3830067ca on touch, make the dialog sticky to avoid instant collapse 2013-10-17 01:09:22 +02:00
perploug
ff40de7c29 tree menu clicks adjustment 2013-10-17 01:08:58 +02:00
perploug
3f76a130f1 hotkeys osx compat 2013-10-17 01:08:39 +02:00
perploug
205d5f7d71 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-16 20:37:35 +02:00
perploug
100ab5643a Localizing cotnent and media editors main grid 2013-10-16 20:37:12 +02:00
Sebastiaan Janssen
f9ad06be29 Something odd going on with the new tests being affected by tests that ran before them, no time to fix. Runs fine independently. 2013-10-16 14:19:24 +02:00
Sebastiaan Janssen
699c651daa Merge pull request #169 from stocksr/U4-3033-take2 
Really Fix U4-3033 - inserting extra blank line at end of CSS
 2013-10-16 04:00:26 -07:00
Robert Stocks
79299175c1 Really Fix U4-3033 - inserting extra blank line at end of CSS 2013-10-16 11:49:02 +01:00
Sebastiaan Janssen
14e3976e88 Merge pull request #142 from lars-erik/6.2.0-recursive_isofdocumenttype 
Recursive PublishedContentExtensions IsDocumentType
 2013-10-16 02:55:09 -07:00
Sebastiaan Janssen
76c86daf24 Update da.xml 2013-10-16 11:50:12 +02:00
Lars-Erik Aabech
a1ef40e4be Split the recursive IsDocumentType into an overload for "real" backwards compatibility. 
Changed string comparison to use InvariantEquals. (guessing it doesn't _really_ break backw. compat?)
Added XML docs.
 2013-10-16 11:38:58 +02:00
Sebastiaan Janssen
e4a0904de6 Merge pull request #167 from lars-erik/change-doctype-defaultnone 
Change doctype - default suggestion none when no matching alias.
 2013-10-16 01:09:02 -07:00
Shannon
6cca01718d Updated changepassword property editor to be able to be more re-used, now using it for the back office user change password which configures itself based on the membership provider configured for the user provider. now to wire it all up. 2013-10-16 17:51:48 +11:00
Shannon
6b259c8147 removes legacy belle files 2013-10-16 15:38:11 +11:00
Shannon
cb727bf6e6 Simplifies user service to launch the dialog and clear user data, updates the login dialog to show that their session has expired when it has expired (not during initial login) 2013-10-16 13:49:50 +11:00
Shannon
6400e7988f adds a logout.aspx for legacy reasons in case an inline page redirects to there 2013-10-16 13:33:08 +11:00
Shannon
93d44df72b After 2 hours of debugging finally figured out the login controller is trying to manually set the iframe url... !? 2013-10-16 13:16:33 +11:00
Shannon
2267ac4534 More work on user timeouts, have the login dialog showing when it needs to and updating the user's ticket and correct new timeout seconds value - now to get it to not re-load routes when they log back in so their data is still editable. 2013-10-16 12:00:42 +11:00
Shannon
7a3e9facd0 Got the user timeout counter all working nicely with minimal server queries, now to show the login dialog when timeout is close or finished. 2013-10-16 11:31:35 +11:00
Shannon
7c881a29ae Fixes path issue and user history issue 2013-10-16 10:37:45 +11:00