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

1364 Commits

Author SHA1 Message Date
perploug
34f0576a90 Fixes: missign web-service reference in installer 2013-11-01 09:42:24 +01: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
c722e57914 Moves the our umbraco web reference to where it needs to be. 2013-11-01 09:21:29 +11:00
perploug
ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
perploug
b0b785954f Dashboard iframe sizing 2013-10-30 19:33:36 +01:00
perploug
e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
perploug
a7f5576fee Wires up the help dialog with our and tv feeds 2013-10-29 21:49:40 +01:00
Shannon
2075311773 Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure. 2013-10-29 11:39:34 +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
perploug
7716413015 updates umb.tv feeds on dashboard 2013-10-28 20:25:26 +01:00
perploug
eb622504f2 RTE updates for styles and button placement 2013-10-28 20:24:02 +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
7679b36f13 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-25 16:29:02 +11:00
Shannon
716def8d33 Completes: U4-3020 Installning package with legacy data types just gives error 2013-10-25 16:28:46 +11:00
Shannon
4ceb16e20d removes contour committed app config 2013-10-25 16:28:26 +11:00
Shannon
61318df0b4 Removes contour files that were committed by accident 2013-10-25 16:27:09 +11:00
diachedelic
d09b34dd03 * Updated references to 'umbraco.aspx' in static content 
* URI encode query strings in frontend API calls
 2013-10-25 16:07:20 +11:00
perploug
7d885e8af0 Visual tweaks for tablet compat 2013-10-23 15:33:35 +02:00
Shannon
322ad6ca26 Completes: U4-3030 Need to remove the starter kit/skin dashboard 2013-10-23 14:30:43 +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
Shannon
3f5fdf840a Completes: U4-3212 Support unlocking a member, also fixes quite a few other issues regarding the membership provider properties of the content type. 2013-10-22 17:36:46 +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
Shannon
2243452261 Completes: U4-3089 fix membership provider to be able to change email address 2013-10-22 11:24:56 +11:00
perploug
17e1020724 language file updates 2013-10-21 14:28:43 +02:00
perploug
652f1e52ec listview selection css 2013-10-21 14:26:26 +02:00
Shannon
3af8354a93 Fixes: U4-3161 YSOD when clicking on user permissions 2013-10-21 11:57:38 +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
a87e699f8d Updates the web.config template to allow password reset 2013-10-18 09:54:34 +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
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
perploug
aef7525354 localization and visual tweaking 2013-10-17 01:10:14 +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
76c86daf24 Update da.xml 2013-10-16 11:50:12 +02: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
Lars-Erik Aabech
607a52883a Change doctype - default suggestion none when no matching alias. 2013-10-15 13:21:30 +02:00
Shannon
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
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
parnar
2ed7fc06ea translated some keys in he.xml language file 2013-10-11 19:35:34 +02:00
perploug
b92f5c4719 ui.xml file changes 2013-10-11 12:19:39 +02:00