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

7905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
2243452261 Completes: U4-3089 fix membership provider to be able to change email address 2013-10-22 11:24:56 +11:00
Shannon
4427554752 Completes: U4-3085 member editor should automatically generate a password for new users 2013-10-22 09:45:07 +11:00
perploug
16be7a2971 External editor sample 2013-10-21 22:19:07 +02: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
d258fc5a9f added minification to grunt file 2013-10-21 14:29:00 +02:00
perploug
17e1020724 language file updates 2013-10-21 14:28:43 +02:00
perploug
24858dfdfc tinymce button color 2013-10-21 14:28:32 +02:00
perploug
2a9a7ee9c5 removes legacy js 2013-10-21 14:28:23 +02:00
perploug
00690d011a listview localization serverside 2013-10-21 14:28:05 +02:00
perploug
4b5284fd7b fallback in case on no children on listview 2013-10-21 14:27:46 +02:00
perploug
a286f358be create dialog localization 2013-10-21 14:27:16 +02:00
perploug
0b65b3b4a1 used dialog closes when going to profile 2013-10-21 14:27:05 +02:00
perploug
48ef1aab1c adds cancel buttons to all dialogs 2013-10-21 14:26:51 +02:00
perploug
652f1e52ec listview selection css 2013-10-21 14:26:26 +02:00
perploug
5a682c44bc minor localization change for keys 2013-10-21 14:26:14 +02:00
Shannon
70a1704b35 Completes U4-2929 Finish obsoleting the remaining legacy property editors 2013-10-21 18:36:46 +11:00
Shannon
d8ff1e97b3 Fixes: U4-3206 MemberService doesn't generate xml for a member 2013-10-21 17:57:36 +11:00
Shannon
39eb0351c0 Completes U4-3086 Remove EditMember.aspx 2013-10-21 17:29:13 +11:00
Shannon
49df332734 Completes: U4-3194 member editor needs group/role support 2013-10-21 17:02:33 +11:00
Shannon
3af8354a93 Fixes: U4-3161 YSOD when clicking on user permissions 2013-10-21 11:57:38 +11:00
perploug
a39d41b1b7 adding media move dialog and support for media containers 
media containers are disabled currently for UI reasons
 2013-10-20 23:36:26 +02:00
perploug
d9a1d3438b minor typo in previous commit 2013-10-20 20:00:04 +02:00
perploug
9000ece7d1 Update service notifications 2013-10-20 19:58:44 +02:00
perploug
2b8c566e65 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-19 15:07:20 +02:00
perploug
aedb17781b WIP on updates notifications 2013-10-19 15:07:02 +02: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
6fd05ab6be Listens to new member events for cache refreshing 2013-10-18 16:23:33 +11:00
Shannon
fca605287b Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/WebBootManager.cs
 2013-10-18 16:18:55 +11:00
Shannon
5e63077a32 Adds Xml output for members to packaging service and ToXml extensions, updates examine event handler to listen to new member events as well as old (until we fix that). Adds events to MemberService 2013-10-18 16:16:30 +11:00
Shannon
ff61812e65 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-membershipprovider 2013-10-18 16:14:24 +11:00
Shannon
d20ea58467 Fixes: U4-3193 Partial view cache needs to invalidate based on cache refreshers 2013-10-18 16:13:41 +11:00
Shannon
c6431bde3f Automagically converts json stored data to it's equivalent json.net json structure and works with dynamics. 2013-10-18 14:07:31 +11:00
Shannon
c737c43fa2 Completes: U4-3169 Publicize new MacroService 2013-10-18 12:54:18 +11:00
Shandem
c4f3dae317 Merge pull request #172 from IDisposable/6.2.0 
Reduce Exceptions thrown during type conversions.
 2013-10-17 18:07:52 -07: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
Marc Brooks
4d5b330567 Reduce Exceptions thrown during type conversions. 
There are tons of places where null, blank or empty strings are being
converted to primative types (like int,, long, etc) or other ValueTypes
(like Guid, DateTime, etc.). When this is attempted, Exceptions are
thrown (and caught/swallowed) to allow for value defaulting. Since this
happens all the time in normal operation, tons of Exceptions are being
thrown. By switching to the TryParse methods available on all primative
types and the interesting ValueTypes, we can greatly speed the
processing of content data.
 2013-10-17 19:12:08 -05: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