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
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
2243452261
Completes: U4-3089 fix membership provider to be able to change email address
2013-10-22 11:24:56 +11:00
17e1020724
language file updates
2013-10-21 14:28:43 +02:00
652f1e52ec
listview selection css
2013-10-21 14:26:26 +02:00
3af8354a93
Fixes: U4-3161 YSOD when clicking on user permissions
2013-10-21 11:57:38 +11:00
a663cad110
Fixes styling on passwordChanger to be inline with Belle styles
2013-10-18 11:55:53 +11:00
e0c1b5cd8d
Fixes merge issues
2013-10-18 11:39:51 +11:00
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
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
a87e699f8d
Updates the web.config template to allow password reset
2013-10-18 09:54:34 +11:00
5d5f7a4516
Updated edit member with correct usage of password changer.
2013-10-18 08:52:46 +11:00
61ef83c748
Gets the password changer working - on the edit user page. reset/change password wth validation
2013-10-18 00:37:51 +11:00
f82329b371
More updates the password changer and edit user
2013-10-17 22:52:37 +11:00
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
d6bd3354cf
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
2013-10-17 11:29:04 +11:00
e94f8da3e8
removes the macro renderings ref
2013-10-17 11:28:39 +11:00
aef7525354
localization and visual tweaking
2013-10-17 01:10:14 +02:00
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
100ab5643a
Localizing cotnent and media editors main grid
2013-10-16 20:37:12 +02:00
3abd4df8bd
Enabled lists plugin in tinymce by default
...
Fixes http://issues.umbraco.org/issue/U4-3023
2013-10-16 16:01:17 +02:00
ea239e6122
Missing languages in RTE insert link dialogue
...
Fixes this issue: http://issues.umbraco.org/issue/U4-2551
2013-10-16 15:53:56 +02:00
76c86daf24
Update da.xml
2013-10-16 11:50:12 +02:00
6400e7988f
adds a logout.aspx for legacy reasons in case an inline page redirects to there
2013-10-16 13:33:08 +11:00
607a52883a
Change doctype - default suggestion none when no matching alias.
2013-10-15 13:21:30 +02:00
35545019a5
Fixes: U4-3111 Codeeditorsave.asmx always appear to fail - might need to be backported to 6.2
2013-10-15 15:51:30 +11:00
0312b947e1
Fixes template editor to re-enable ajax saving - might need back porting to 6.2
2013-10-15 15:38:08 +11:00
2ed7fc06ea
translated some keys in he.xml language file
2013-10-11 19:35:34 +02:00
b92f5c4719
ui.xml file changes
2013-10-11 12:19:39 +02:00
11441fb1b1
ui.xml release files
2013-10-11 12:16:24 +02:00
14ba484fc1
Don't include release configs in final package
2013-10-11 12:11:47 +02:00
0f894da7a6
Merge remote-tracking branch 'origin/7.0.0-pubcontent' into 7.0.0
2013-10-11 12:07:26 +02:00
133e2fdba7
tree config updates
2013-10-11 11:48:26 +02:00
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
9a0679d41c
docs update
2013-10-11 10:54:39 +02:00
42dd48a3d1
removed editmember.aspx
2013-10-11 17:32:04 +11:00
937b308444
Streamlines form and form validation with new val-form-manager (replaces a couple of other directives). Fixes styling on the umb-content-name, removes the test MyPackage stuff from app-plugins.
2013-10-11 15:44:49 +11:00
3d8138f3ef
Added configuration to the multinode picker
2013-10-10 21:15:04 +02:00
e67f85695c
fixes U4-3054 icon picker viewstate
2013-10-10 19:47:12 +02:00
088253ebfd
minor content editor tweaks
2013-10-10 19:46:46 +02:00
e0da6f2dec
remove old membersearch
2013-10-10 19:41:41 +02:00
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
e34e63db51
hides empty divs on initial load
2013-10-10 13:34:02 +02:00
b512376c5c
more member editor updates
2013-10-10 18:46:28 +11:00
912a111f14
broken da.xml file
2013-10-09 15:54:18 +02:00
5d71e08922
Fixes manifest file again - just tested that the app loads even if a manifest is invalid
2013-10-09 18:22:27 +11:00
e51b43084b
Fixes: U4-2762 Handle errors in package.manifest & fixes manifest stylesheet parsing with unit test
2013-10-09 18:13:24 +11:00
3c38b335a6
Converts DlrScripting & xslt to the correct webforms structure.
2013-10-09 12:07:50 +11:00
3a8bbcc8fc
Fixes up the PartialView, PartialViewMacro and Xslt create dialogs after merge and ensures PartialView dialog is up to v7 legacy standard
2013-10-09 11:57:14 +11:00
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
Shannon