Commit Graph

7863 Commits

Author SHA1 Message Date
Shannon
acb2e58a5c Completes: U4-3067 Send to publish not implemented 2013-10-31 18:28:02 +11: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
90c62bddd9 Fixes security check on content controller for the correct publish letter. Adds cache listeners to the MacroService. Ensures the status message is cleared when a form is reset. 2013-10-31 17:22:10 +11:00
Shannon
719b777188 fixes js tests 2013-10-31 16:57:15 +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
ab6a26445e Fixed the horrible mess that was the permissions editor dialog. 2013-10-31 12:57:41 +11:00
Shannon
881dab1612 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-10-31 11:47:50 +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
Shannon
4c3d700c54 Changes the UserMembershipProvider to validate an already hashed/encrypted password and then validate a non hashed/encrypted attempt, this is to maintain compatibility with how v6 works, it's not ideal but needs to be there. Creates a settable property on the password changer to be able to dynamically hide the old password field if you are going to manually set the old password. Updates the EditUser to hide the old password field and pass in the alraedy encrypted pword to validate against like it used to be. 2013-10-31 11:35:12 +11:00
perploug
bfbed0249e moves the label switch a bit up the controller 2013-10-30 23:02:50 +01:00
perploug
ea38f7a998 Ensures folder browser doesnt allow upload on creation 2013-10-30 22:33:36 +01:00
perploug
b704220133 Enable upload drag/drop message on folder browser 2013-10-30 22:16:51 +01:00
perploug
67903d7590 Publish button changes label depending on publishing access
Needed for the switch between send to pub and save and pub. So the
controller on the server handles the rest, same method called ideally
2013-10-30 22:16:31 +01:00
perploug
06d3f15fa0 We should return all content types, if none are set to allow at root 2013-10-30 22:14:58 +01:00
perploug
00f8472cfc Adds permission checks to contentResource 2013-10-30 22:12:13 +01:00
perploug
db1ae58f96 relative image detection, solves tree icon bug 2013-10-30 22:11:29 +01:00
perploug
d981058498 Content name directive auto-focus fix 2013-10-30 22:10:46 +01:00
perploug
81d2aac0d2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-30 19:35:02 +01:00
perploug
ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
perploug
00d0d5e046 picker tweaks 2013-10-30 19:34:12 +01:00
perploug
b0b785954f Dashboard iframe sizing 2013-10-30 19:33:36 +01:00
Stephan
ed80f75c1c Merge pull request #177 from gildebrand/patch-1
Changed spelling of Wonderful to the correct one
2013-10-30 07:17:16 -07:00
gildebrand
cf1cbb5f94 Changed spelling of Wonderful to the correct one 2013-10-30 15:15:39 +01:00
Tim Geyssens
7f56c79a8d Member group picker prop editor, almost got it working 2013-10-30 13:56:29 +01:00
Tim Geyssens
69e445239a Updates member group picker dialog 2013-10-30 13:47:54 +01:00
Tim Geyssens
21f0e60061 More member group picker WIP 2013-10-30 13:41:29 +01:00
Tim Geyssens
8b5eefafdb Some more member group picker WIP 2013-10-30 13:33:55 +01:00
Tim Geyssens
54e4866325 More work on member group picker 2013-10-30 13:19:10 +01:00
Tim Geyssens
5ce6ec124a Adds member group picker prop editor to Umbraco.Web 2013-10-30 13:11:59 +01:00
Tim Geyssens
4f79b8bf45 Updates video dashboards to show chapters 2013-10-30 13:03:52 +01:00
perploug
451004d45e Picker fine-tuning 2013-10-30 10:54:47 +01:00
perploug
e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
Shannon
bb5dad8c1d Removes user timeout timer to do digests, now just has it's own internal clock and the countdown timer will count for itself and only digest it's own scope, this is heaps better for performance. 2013-10-30 18:57:43 +11: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
Shannon
35f842f7ba Content type and multiple content type parameter editors completed. 2013-10-30 16:53:53 +11:00
Shannon
e4f8f6ebd5 Fixes macro parameter form validation, adds the number parameter editor, updates the parameter editor mapping, adds more fixes to the number fixer and changes the integer property editor to use a type='number' 2013-10-30 15:45:16 +11:00
Shannon
46ba9718ff Changes the explicit paramet editor implementations to simply use the already created property editors, updates the legacy parameter editor mappings and adjusts the resolver to use the mappings if one is not found. 2013-10-30 14:36:07 +11:00
Shannon
68b955e611 Fixes isDialog mode trees, creates content picker parameter editor, ensures the tree dialogs are all isdialog=true, fixes property editor resolution that are parameter editors. 2013-10-30 14:12:06 +11:00
Shannon
5be7ed7d58 Fixes: U4-3277 Macro insert in rte is not pre-populating selected macros 2013-10-30 13:28:41 +11:00
Shannon
201e28513a fixes up some stuff with the slider 2013-10-30 13:05:24 +11:00
Shannon
ca8e840195 Completes: U4-3274 Create new Slider editor 2013-10-30 12:54:21 +11:00
Shannon
b30a479f86 Fixes the number editor - due to some angular bugs had to make a fixNumber directive. 2013-10-30 11:23:21 +11:00
Shannon
95d98b132a Updates installer to not install some data types that we're not shipping with, fixes up some mappings, changes the simple editor convert to be the markdown editor converter (need to test that) 2013-10-30 08:59:28 +11:00
Shannon
ca0db38870 fixing file naming conventions to lower case 2013-10-30 08:37:36 +11:00
Shannon
3272be6a35 fixing file naming conventions to lower case 2013-10-30 08:37:23 +11:00
Shannon
2b4957d4f2 Fixes up mntp pre-value editor with convention naming 2013-10-30 08:35:05 +11:00
Shannon
abb28250f8 Updated property editors legacy -> new mappings 2013-10-30 08:31:22 +11:00
Shannon
d922846a7e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-30 08:16:30 +11:00
Shannon
70491bb6e6 changed name to readonlykeyvalues 2013-10-30 08:16:12 +11:00