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

208 Commits

Author SHA1 Message Date
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Mads Rasmussen
1a0c095f40 Merge pull request #932 from engern/MacroParamSortOrder 
Fixes U4-7472 - Should be possible to sort macro parameters
 2016-02-19 09:27:27 +01:00
Shannon
4a8b59bdfa putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab. 2016-02-10 14:34:33 +01:00
Shannon
af543c56ec moves model to correct namespace 2016-02-10 13:31:36 +01:00
bjarnef
0bfc5f1272 Change icons in tinymce config 2016-02-08 15:07:16 +01:00
Shannon
0ea68f4f42 added logic for media and member type angular callbacks that existed for content types - assuming this is important and should be there for all content types. Added alias information to validation message returned from server. 2016-02-04 19:40:29 +01:00
Shannon
56f0d67639 Merge branch 'dev-v7' into temp-U4-7716 
Conflicts:
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-25 15:54:50 +01:00
Claus
10617d1bd5 Agree, these should not be needed - removing. 2016-01-24 22:18:18 +01:00
Shannon
0c0518ff7b ensures that abstract models have a DataContract 2016-01-21 15:06:57 +01:00
Shannon
52b1a09de0 abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though. 2016-01-21 15:01:55 +01:00
Shannon
a8e43a3908 U4-7716 Content type editor - YSOD when adding a property with the same alias as it's parent 2016-01-21 11:39:46 +01:00
Claus
b9e7990b7c Fixes: U4-7560 Default member properties should not be editable 
Added locked property to content type properties by alias.
Ensured built in member properties are locked in the editor.
Content type editor changes for supporting locked properties.
 2016-01-13 18:43:06 +01:00
Shannon
9dc57b0e37 Merge branch '7.4.0' into temp-U4-7634 
Conflicts:
	src/Umbraco.Core/Services/ContentTypeServiceExtensions.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-13 14:08:19 +01:00
Shannon
b89d17914d fixes usage of model.contentType.availableCompositeContentTypes to use the availableCompositeContentTypes directly attached to the model. removes the FirstContentType property and adds simple content type service methods to count the doc type number, moves the request to get availableCompositeContentTypes to the dialog (where it's needed and so it's lazy) 2016-01-11 17:17:26 +01:00
Claus
e016622fe3 Fixes: U4-7639 Misleading message on creating first document type and click on "compositions" 
Added in FirstContentType property on object returned from GetEmpty to indicate whether this is the first content type being created or not (different error messages in backoffice).
 2016-01-11 17:16:17 +01:00
Claus
3676de0fe8 Reverting code to add additional meta data on compositions. 
Added locked compositions to content type object.
Changed UI to use the lockedCompositeContentTypes instead.
 2016-01-11 12:07:36 +01:00
Shannon
050109edd7 U4-6837 New content type editor: availableCompositeContentTypes could be moved to service. 
Allows for assigning compositions to doc types that are being created.
Removes unused getAssignedListViewDataType from contentTypeResource.
Removes unused getPropertyTypeScaffold from memberTypeResource.
Removes unused performContainerDelete from memberTypeResource - since member types don't support folders.
Ensures correct security for the ContentTypeController.GetAllPropertyTypeAliases and ContentTypeController.GetAvailableCompositeContentTypes.
Removes unused ContentTypeControllerBase.GetAssignedListViewDataType, this is no longer used because the list view is configured using the DataTypeController.
 2015-12-15 12:25:42 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
 2015-12-03 09:22:19 +01:00
engern
855e3b3dcc Add the possibility to sort the macro parameters 2015-11-29 12:06:19 +01:00
Stephan
eb5589e064 Remove PropertyGroup.ParentId, sanitize Property groups/types 2015-11-17 16:55:14 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Shannon
d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Stephan
6fd185df2d Replace evil magic number with constant 2015-11-12 15:32:53 +01:00
Shannon
a351f6cfc8 Fixes up the error handling with move/copy dialogs. 2015-11-09 17:58:43 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Jeffrey Schoemaker
a4bd3abfbe U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:25:15 +01:00
Shannon
64c983eb07 Updates PR with fixes for code and implementation logic for the url list. 2015-10-28 12:28:29 +01:00
Shannon
8f7add203e Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2015-10-27 10:29:11 +01:00
Daniel
ef091e8c3a U4-7296 
http://issues.umbraco.org/issue/U4-7296
 2015-10-22 23:41:18 +02:00
Shannon
41c5f6a8bf Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
 2015-10-22 12:12:03 +02:00
Rasmus John Pedersen
78475b0686 Added recursive option to copy dialog 2015-10-09 20:25:51 +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
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
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
Stephan
9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-09-16 13:25:32 +02:00
Shannon
685aea1728 Fixes: U4-6879 Validation issues when creating new content and cancelling save event. 2015-08-20 11:50:32 +02:00
Per Ploug Krogslund
0f4596c897 Cleanup the mappers and the display classes 2015-08-19 22:38:08 +02:00
Per Ploug Krogslund
1ff7b34b86 revalue flag on basic datatype 2015-08-11 11:52:29 +02:00
Shannon
85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-08-04 17:10:58 +02:00
Shannon
6d8ffb903f Ensures events for deleting, trashing and unpublishing are done using the event messages, updates UI to support showing these messages in the list view, Since we cannot change the 
method results on a service, we've created a new temporary service that we will explicitly implement with an extension method to get it. This is temporary until v8 where we will just replace
the original methods on the service with these methods and then remove this class.
 2015-07-29 15:12:12 +02:00
Per Ploug Krogslund
0bf86e8286 Adds list view name for the content type 2015-07-06 15:19:20 +02:00
Per Ploug
8679c26f3d Added icons and groups on all core editors 2015-06-24 21:43:14 +02:00
Per Ploug
5e81aed928 Adds icon and group to property editor classes 2015-06-24 12:54:06 +02:00
Per Ploug
2e2f8723a0 Set collections on property groups 2015-06-23 09:56:59 +02:00
Per Ploug
34060ceed6 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-06 08:40:11 +02:00
Shannon
f2f29eaa8e Fixes up some more mappings, adds another test to simulate persisting an updated type from the display model - which isn't working so need to fix more. 2015-06-05 16:13:13 +02:00
Per Ploug
cf3dfe4992 merge 2015-06-05 12:20:45 +02:00
Per Ploug
55daa2ee45 WIP membertype editor 2015-06-05 12:15:20 +02:00