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

361 Commits

Author SHA1 Message Date
Shannon
acd52d42f4 Refactoring TreeNode to inherit from EntityBasic = makes much more sense and makes our models more consistent. 2013-11-12 12:30:10 +11:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
perploug
be9f0c066e ditto 2013-11-04 14:56:18 +01:00
perploug
336182d8b7 Absolute image path support, with and without tilde 2013-10-31 08:47:46 +01:00
Shannon
523c48d4fd Nearly have send to publish working, it's all wired up in the UI to the controller, just need to implement the logic. 2013-10-31 18:17:30 +11:00
Shannon
1ead3f9b6a Updated the content display model to pass in a list of the allowed actions (using the letter of the permission). We then dynamically generate the action buttons on the content editor based on what the user is actually allowed to do and the current state of the content. Fixed up some content saving validation for Create + Publish at the same time, since we never allowed that behavior before we now have to check for both permissions during this one execution. Updated the Unpublish method to check for publish permissions - unpublish is an action but it is not permission assignable, you can only unpublish if you can publish. Fixes the user session timeout display timer. 2013-10-31 16:51:08 +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
perploug
db1ae58f96 relative image detection, solves tree icon bug 2013-10-30 22:11:29 +01:00
Shannon
51aefd2b6b Adds the tab and multi-tab parameter editors 2013-10-30 18:30:04 +11:00
Shannon
5c7f551015 Creates a re-usable dropdown/multilist for any type of Entity that uses the entityResource, so now user picker, property type (+ multiple) param editor, content type (+multiple) param editor all use this. Fixes: U4-3268 UserPicker doesn't actually persist a value 2013-10-30 18:14:16 +11:00
perploug
a7f5576fee Wires up the help dialog with our and tv feeds 2013-10-29 21:49:40 +01:00
Shannon
d62aae0205 Fixes property editors that have default pre-values for those prevalues to show up when creating a new data type, fixes: U4-3147 Create tag supported property editors - and adds the tag group to the pre-values for the tag property editor. 2013-10-29 18:17:10 +11:00
Shannon
f5a2f87038 Fixes member issues 2013-10-29 14:03:16 +11: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
Shannon
6263b07087 Working on (WIP) U4-3255 Fix search - shouldn't search on every key change, shouldn't show up for non-search sections, shouldn't return ISearchResults 2013-10-28 18:38:20 +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
Stephan
128a08f169 Web.Mvc - Refactor UmbracoViewPage, UmbracoTemplatePage, support strongly-typed content 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-10-25 13:21:29 +02:00
Shannon
36ffd41007 Updates data type service for the way it saves pre-values so we can maintain ids if necessary - updates the pre-value editors to except a different dictionary which includes an id if necessary. This all fixes: U4-2751 Check that when publishing keys for drop down list prop eds that if we change a value that the id remains constistent 2013-10-24 16:38:00 +11:00
Shannon
a5d6cfd812 Adds HideLabel pre-val to the RTE, created a new ConfigureForDisplay method which allows property value editors to change any properties like HideLabel based on the pre-values. 2013-10-24 15:06:41 +11:00
Shannon
8d724ff2f7 Completes: U4-3040 Create UmbracoHelper methods for querying real tags on the front-end and creates new TagQueryContext 2013-10-24 13:31:10 +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
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
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
00690d011a listview localization serverside 2013-10-21 14:28:05 +02:00
Shannon
d8ff1e97b3 Fixes: U4-3206 MemberService doesn't generate xml for a member 2013-10-21 17:57:36 +11:00
Shannon
49df332734 Completes: U4-3194 member editor needs group/role support 2013-10-21 17:02:33 +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
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
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
ac6aaedf3e missing csproj commit to fix build 2013-10-18 08:34: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
fd6046ebb6 The user change password dashboard now works and adheres to the membership provider rules. 2013-10-17 14:46:16 +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
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
7c881a29ae Fixes path issue and user history issue 2013-10-16 10:37:45 +11:00
Shannon
8d9f741a6a Working on user timeouts - now have the user timeout time being nicely tracked in the back office with a bit of injector magic both on the client side and the server side with filters. Now to wire up the call to get remaining seconds if a request hasn't been made for a specified amount of time, then we can add UI notification about timeout period. 2013-10-15 18:46:44 +11:00
Shannon
e7162d46ce ignores some properties from being updated after saving otherwise we get duplicate tabs, etc... 2013-10-15 15:12:44 +11:00
Shannon
171de064f6 Fixes up the legacy calls to UmbClientMgr.mainTree() and UmbClientMgr.mainTree().getActionNode() 2013-10-15 12:26:16 +11:00
Shannon
d9c42e2aca Fixes initial part with legacy trees and legacy actions - now a modal window can launch - but now we need to get the legacy umb client manager js tree stuff hooked in. 2013-10-14 18:47:34 +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
Stephan
871e390c5e U4-3094 - Fix GetPropertyValue returned type in DynamicPublishedContent 2013-10-11 10:28:16 +02:00
Shannon
b9975ad1f5 Gets password resetting working and displaying the generated one in the UI. 2013-10-11 12:25:10 +11: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
6f39f190a4 Adds guid to entitybasic 2013-10-10 13:33:25 +02:00
Shannon
f9319c0db9 Lots more work done with members mostly around passwords and membership provider - can't yet update your password but it's close 2013-10-10 20:56:30 +11:00
Shannon
b512376c5c more member editor updates 2013-10-10 18:46:28 +11:00
Shannon
52aac5ba10 Ok, got members creating so long as the umbraco membership provider is being used - otherwise currenlty you'll get a ysod saying we don't support that. Now to get updating working. 2013-10-10 17:44:56 +11:00