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

4566 Commits

Author SHA1 Message Date
Shannon Deminick
283de5a7d6 Merge pull request #831 from umbraco/temp-U4-7178-media-library 
Temp u4 7178 media library
 2015-10-27 11:41:10 +01:00
Per Ploug
dd05fe7466 merge 2015-10-22 18:07:17 +02:00
Per Ploug
b4286cffbe Fixes up folderbrowser inheritance 2015-10-22 18:05:42 +02:00
Shannon
602915a311 makes FolderBrowserPropertyEditor have the grid as the primary layout for the list view. 2015-10-22 17:47:22 +02:00
Per Ploug
7463836ed2 merge 2015-10-22 17:45:46 +02:00
Shannon
f66c07ec81 updates base data creation to not install the folder browser and instead to use the default media list view for the media folder property. Updates the FolderBrowserPropertyEditor to use the default list view property editor with no pre-values. 2015-10-22 17:34:01 +02:00
Shannon
fd26f98356 fixes template mapping issue when saving content types 2015-10-22 15:10:44 +02:00
Per Ploug
9f090801fc Obsoletes the Folderbrowser and changes install to use List-view 2015-10-21 12:52:10 +02:00
Per Ploug
1b55f04129 small docs comment fix 2015-10-21 11:52:51 +02:00
Per Ploug
19759000f4 Media and content move return wrong error format 
Changing both move methods to return the same error signature as
publish/delete/etc
 2015-10-21 09:57:57 +02:00
Shannon
65b080b03f fixes ysod with validation errors on doc type editor. 2015-10-20 15:37:11 +02:00
Per Ploug
55b98cc446 Fixed: U4-7271 Folder does not list allowed media types 2015-10-19 15:22:21 +02:00
Per Ploug
13ae946f30 Fixed: U4-7264 Support for folder upload 
Fixed issues noted in review
 2015-10-19 08:58:52 +02:00
Per Ploug
f7c2f779c2 Fixed: U4-7264 Support for folder upload 
part of the media library polish, when a folder is dragged to the view,
it will check if folders exist, and create if needed, this makes it
easier to replicate a folder structure when uploading.
 2015-10-16 12:48:34 +02:00
Per Ploug
53fdc801f3 Return basic entity instead of display entity 2015-10-16 11:32:13 +02:00
Shannon
7268c6786d manual merge back in the temporary DeleteContainerById method 2015-10-15 15:42:46 +02:00
Shannon
8205048e4d Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor-validation 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
	src/Umbraco.Web/Editors/ContentTypeController.cs
 2015-10-15 15:32:48 +02:00
Shannon
e1629932dc Wires up the correct saving logic + validation for the member type editor, moves the GetSafeAlias method to the EntityController 2015-10-15 15:29:14 +02:00
Shannon
33c206d820 Wires up the correct saving logic for media types + validation, refactors the logic so it can be reused everywhere. 2015-10-15 14:48:50 +02:00
Per Ploug
f5fa860b5c Get Media folders from node 2015-10-15 14:08:29 +02:00
Per Ploug
755853cc50 Sets up trees, menus and dialogs for content type moving 
The actual service apis for moving is not implemented yet, but this is
the scaffold for using it.
 2015-10-15 13:14:13 +02:00
Shannon
21a748af29 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor-validation 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/directives/validation/valregex.directive.js
	src/Umbraco.Web.UI.Client/src/less/forms.less
 2015-10-14 12:13:51 +02:00
Claus
d92af31b0a Fixes: U4-7246 Integer datatype PropertyEditor is missing ValueType definition 2015-10-14 09:59:13 +02:00
AndyButland
dda247fea5 Implemented decimal property editor 2015-10-14 09:59:09 +02:00
Claus
30d8e53541 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-10-14 09:58:43 +02:00
Shannon
2922e962e0 Gets validation working with composition alias conflicts 2015-10-09 19:03:11 +02:00
Shannon
6017e9ddf9 Gets group and property level validation wired up to the fields, ensures things like duplicate field warnings are created with the correct indexed field names. Fixes a few old directives to correctly watch for attribute interpolation changes which is need for some of this validation to work since it's dynamically populating the field names. 2015-10-09 17:28:22 +02:00
Per Ploug
9d220b40af Fixed: U4-7207 Cant save partial view more then once 2015-10-09 11:09:27 +02:00
Shannon
c477f7a840 Gets more validation bits wired up. Server side validation is now working which is based on val-server-field since we can use this natively with the asp.net ModelState result instead of the val-server which is actually to be used with PropertyType (Property Editors). Next up is validation for the different tabs of the editor. 2015-10-08 17:13:38 +02:00
Shannon
97c352030a Gets a little more validation working and creating using the new Save models 2015-10-07 17:16:42 +02:00
Mads Rasmussen
86d05ccf95 add layouts prevalue editor to list view 2015-10-06 21:03:00 +02:00
Shannon
33906c7730 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor-validation 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2015-10-06 17:21:49 +02:00
Shannon
1b21e04dc2 WIP for model mappers to new content editor save model, udpates to js to use that 2015-10-06 17:19:08 +02:00
Shannon
52d2306e17 Fixes: U4-7196 XSS vulnerability in BrowseRepository 2015-10-06 11:36:54 +02:00
Shannon
62611a7255 U4-7157 remove ~/umbraco/webservice.asmx 2015-09-29 10:54:56 +02:00
Mads Rasmussen
e1f3e82fbf U4-6924 Updated ng-file-upload bower dependency to latest version, added support for accepted file types and max file size in directive. Get file types from config. Still missing max file size. 2015-09-28 11:55:12 +02:00
Per Ploug
6c5e35ec2c Fixed: U4-7150 Inconsistent tree aliases 
Changes all translation files and tree classes to have consistent
naming, updates trees.config to these new alias's
 2015-09-28 08:54:00 +02:00
Per Ploug
e4e3c46d15 Remove the culture from tree header localization 2015-09-25 16:29:41 +02:00
Shannon
7610b6f592 Merge branch 'dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor-validation 2015-09-25 14:27:10 +02:00
Per Ploug
8d57e0cd1d Less hacky way to lookup current user culture 2015-09-24 15:52:44 +02:00
Per Ploug
c13ae20885 U4-4761: adds overload to treeattribute 2015-09-24 15:49:17 +02:00
Per Ploug
6dc4e2d2ae U4-4761 Member translation 
Makes all trees translateable, does not break the current titles set on
atttributes, but for trees that does not have a title set, the tree wil
try to look up a treeheader.
 2015-09-24 15:30:08 +02:00
Shannon
1410a2d482 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor-validation 2015-09-24 12:14:14 +02:00
Shannon
94bc440437 adds note 2015-09-24 12:14:08 +02:00
Per Ploug
9f9946eb1f Default contenttype icons 2015-09-23 21:01:32 +02:00
Per Ploug
1d23d2b7c6 Fixed: New document types fails to save 2015-09-23 20:40:03 +02:00
Shannon
ff9027c07d Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-09-23 14:03:15 +02:00
Stephan
3124ea4e67 U4-7129 - BatchedDatabaseServerMessenger degraded non-batching mode when no context 2015-09-22 18:20:49 +02:00
Shannon
03f68cefb7 performs a fallback check for HttpContext in the batched server messengers in some cases where cache refreshers are executed on async threads... though there's not much we can do about when they are fired on background threads. 2015-09-22 14:39:55 +02:00
Stephan
c3076d6b8d Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-09-18 13:43:16 +02:00