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

578 Commits

Author SHA1 Message Date
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
8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Sebastiaan Janssen
dc17a20bb8 Adds required namespace + a fake class to make sure the namespace exists 2016-01-15 17:05:09 +01:00
Shannon Deminick
4068c527bc Merge pull request #1019 from umbraco/temp-U4-7560 
Fixes: U4-7560 Default member properties should not be editable
 2016-01-14 11:29:56 +01:00
Claus
b9cafa2016 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 09:41:14 +01:00
Claus
13a9f40815 Fixes: U4-7728 Folder view in media section gives an exception 
Ensuring umbracoFile property isn't accessed if this is called on a folder.
 2016-01-14 09:40:40 +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
94a1f7e078 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
 2016-01-13 12:11:27 +01:00
Sebastiaan Janssen
8e024fccff Don't hardcode the umbracoFile constant 2016-01-12 20:05:22 +01:00
Sebastiaan Janssen
43227d4510 Support for multiple properties spawning a url - adding more uploadfields to umbracoSettings.config (autoFillImageProperties) 2016-01-12 19:46:05 +01:00
Sebastiaan Janssen
79cc4cd2fa Change "umbracoFile" to the constant for this value 2016-01-12 18:16:55 +01:00
Sebastiaan Janssen
ff83d2e1f4 U4-7561 Backoffice Media Section should provide information on physical location of files 2016-01-12 17:41:53 +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
f62920dc47 Removed adding compositions from parents as this breaks core functionality. 
Ignoring property in mappings where it isnt needed.
Updating the LockedCompositionsResolver to get parent and use path instead of trying to use path which can be null on GetEmpty.
 2016-01-11 12:07:38 +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
Claus
0d37357376 Mark compositions coming from parents with metadata. 
Ensure metadata is not ignored.
 2016-01-11 12:07:31 +01:00
Shannon
5767cea8f2 fixes build/merge 2016-01-06 12:58:05 +01:00
Shannon
4e3cf6c608 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
	src/Umbraco.Web/Editors/ContentTypeController.cs
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2016-01-06 12:54:19 +01:00
Shannon Deminick
e0baf45247 Merge pull request #992 from umbraco/temp-U4-5168 
U4-5168 Media Items label says "Document Type" instead of  "Media Type"
 2016-01-06 12:22:53 +01:00
Shannon
4838bf62f7 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-06 12:01:12 +01:00
Sebastiaan Janssen
403af78ba9 U4-5168 Media Items label says "Document Type" instead of "Media Type" 2016-01-06 11:22:15 +01:00
Sebastiaan Janssen
f4e29d90e0 Code sample No.1 2016-01-05 23:12:09 +01:00
Shannon
b13b4953c3 U4-6890 New content type editor: Missing sorting of properties from server 2015-12-21 10:37:54 +01:00
Claus
7cf1491661 Merge branch 'temp-U4-6837' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
 2015-12-16 12:32:16 +01:00
Sebastiaan Janssen
d123967b14 Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 15:31:47 +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
Alexander Todorov
aed906e682 U4-7508 - IsChildOfListView should be populated for Media items, similarly to Content items 2015-12-08 18:41:59 +02:00
Stephan
22eea2b7db Fix tests 2015-12-03 12:56:59 +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
Sebastiaan Janssen
d863ff364e U4-7321 Update Doc type edit link on content item for 7.4 since it will be different 
#U4-7321 Fixed
 2015-12-02 14:41:37 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Shannon
fd66f08520 Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates. 2015-11-26 13:07:22 +01:00
Stephan
3fe235fa35 Sanitize content types .ContentTypeComposition and .PropertyTypes 2015-11-20 18:36:55 +01:00
Shannon
4c544acb42 fixes links so that working with vdirs works too. 2015-11-19 19:21:55 +01:00
Shannon Deminick
c7c5f481f1 Merge pull request #879 from danieland/U4-4794--nodebug 
U4 4794  nodebug
 2015-11-19 19:10:35 +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
Shannon
d379b98c57 Gets data type folders working/creating, data types being able to be created in folders, tree syncing with data type paths, fixes up some localization stuff and fixes up some issues with media type folders with parent ids 2015-11-12 18:59:43 +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
Daniel
a9ad0ae8eb removed the debug check 2015-11-02 23:34:33 +01:00
Jeffrey Schoemaker
9c8b9f8bb4 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:25:41 +01:00
Jeffrey Schoemaker
a4bd3abfbe U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:25:15 +01:00
Stephan
da85e4eb28 fixes list view ancestor check fix 2015-10-29 12:20:10 +01:00
Shannon
fbc08d66f1 fixes list view ancestor check 2015-10-29 12:05:46 +01:00