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

3992 Commits

Author SHA1 Message Date
Shannon
8b80a22018 Merge branch 'temp-U4-7748' into temp-U4-7747 2016-01-20 13:32:40 +01:00
Shannon
9c58e82169 publicized required method for externally setting template markup, removes logic from core for this 2016-01-20 12:47:09 +01:00
Shannon
42fbcb6f41 Bumps version so that the MB core can reference updated code 2016-01-20 11:45:33 +01:00
Shannon
fe563b0828 adds AdditionalData to the event args so we can use that to check for specific keys/values when consuming events and maintain compatibility. 2016-01-20 11:19:04 +01:00
Shannon
9a0e85af10 Creates new CreateTemplateForContentType for use with the content type editor, I need to somehow add some additional information to the event raised there so that we can listen to that event in MB in order to create the default template markup. 2016-01-19 21:38:11 +01:00
Shannon
e857b0a5f4 Updates the strange TypeFinder GetTypeByName method to use BuildManager by default. 2016-01-19 15:58:38 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Sebastiaan Janssen
f7676062ea Bumps version 2016-01-15 13:47:18 +01:00
Shannon
a468cb78c5 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 19:56:43 +01:00
Shannon
b5abbc7c30 Adds some null checks 2016-01-14 18:11:48 +01:00
Shannon
da9a2c59fc Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 17:40:36 +01:00
Shannon
44b22503e1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-14 16:36:13 +01:00
Shannon
bfa12856db Fixes issue with DefaultRepositoryCachePolicy when creating new items - we were generating the cache key before actually calling the method to create the item therefore there was no id assigned yet (it would be zero). 2016-01-14 16:36:03 +01:00
Sebastiaan Janssen
f057976f78 U4-7735 Localization fallback doesn't seem to work. 
#U4-7735 Fixed
 2016-01-14 15:06:16 +01:00
Shannon
c2c350a517 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-14 10:37:14 +01:00
Shannon
afe2aeda1b Merge branch '7.4.0' into temp-deploy-29 2016-01-13 19:11:20 +01:00
Shannon
dfa687e695 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:18:30 +01:00
Shannon
54669ee2bc Ensures you cannot move a child doc type, changes the result of GetAvailableCompositions to be a model instead of a tuple, the result also includes the current ancestor list which we can use to disable items in the list, makes these models/methods internal since they'll most likely be changing, 2016-01-13 16:25:35 +01:00
Shannon
17902712ac fixes merge/build 2016-01-13 14:44:17 +01:00
Claus
59759c4919 Merge pull request #1018 from umbraco/temp-U4-5982 
U4-5982 Webpages unpublishing by themselves
 2016-01-13 14:29:37 +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
68ddea2776 refactors a bit of code from the PR, adds more translations to the other english file. 2016-01-13 12:33:57 +01:00
Stephan
02e94f9243 deploy-29 - Sanitize UniqueId 2016-01-13 12:32:30 +01:00
Shannon
fae5618865 Merge branch 'UKFest-6322' of https://github.com/JJCLane/Umbraco-CMS into JJCLane-UKFest-6322 2016-01-13 12:23:26 +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
Per Ploug
cec1f6dae3 Merge remote-tracking branch 'refs/remotes/origin/7.4.0' into dev-7.4.0-ModelsBuilder 
# Conflicts:
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Editors/ContentTypeController.cs
 2016-01-13 12:10:08 +01:00
Shannon
074d894271 Fixes: U4-7706 Property Type UniqueIds do not stay consistent during package installation 2016-01-13 12:10:04 +01:00
Claus
79c05a129d Merge pull request #1009 from umbraco/temp-U4-7588 
U4-7588 Conflicting compositions should not be allowed
 2016-01-13 11:58:38 +01:00
Shannon
3131096ffb Ensures that itself is never returned in the list, not even disabled (since you can never select yourself), ensures that any comp already selected is enabled for selection in the UI. 2016-01-13 11:33:46 +01:00
Shannon Deminick
244eb08545 Merge pull request #1010 from umbraco/temp-U4-7557 
U4-7557 Support folders for import/export, packaging
 2016-01-12 16:17:14 +01:00
Shannon
85178bbad8 Changes GetAvailableCompositeContentTypes to return a list of composite candidates and then whether they are actually allowed or not based on the filters. Updates the controllers response to be a list of which content types are allowed or not, updates the view accordingly, changes when the filtering happens so that it happens after the content type has been updated with new properties. 2016-01-12 15:44:37 +01:00
Shannon
f0b0cd1641 adds success checking to the CreateContentTypeContainer results, adds overload instead of optional parameter (breaking change), changes GetContainer(string folderName, int level) to return IEnumerable and changed name to GetContainers - since there could be multiple results for the same container name at a given level. 2016-01-12 14:32:45 +01:00
Shannon
67994c630f fixes null checking and ensures that the current property type aliases are passed up when first launching the compositions dialog. 2016-01-12 13:46:18 +01:00
Shannon
7389d343e4 adds more unit tests 2016-01-12 13:32:03 +01:00
Shannon
f7b34c76f9 got the filtering all working - this ensures that no CTs are selectable if any current property type exists in one of them in the list and re-filters on each CT selection in the list to ensure no illegal comps can be created. 2016-01-12 13:32:02 +01:00
Shannon
32377b29b8 Have content type filtering working on the compositions list so a dev is not allowed to create an illegal composition - next we need to pass in the already existing property types to further ensure an illegal composition cannot be created. 2016-01-12 13:30:49 +01:00
Shannon Deminick
a6df74e299 Merge pull request #1008 from umbraco/temp-U4-7639 
Temp u4 7639
 2016-01-12 13:25:51 +01:00
Claus
bbd6908af3 Ensuring you can create new document types in root. 
Parsing result of webservice call as integer.
Ensuring the correct error messages are shown.
 2016-01-12 13:06:33 +01:00
Sebastiaan Janssen
2a3619e219 Fix merge problem that broke the build 2016-01-12 12:06:15 +01:00
Sebastiaan Janssen
5a62713de4 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
 2016-01-12 11:39:10 +01:00
Sebastiaan Janssen
79f0e2563c Allows for creation of packages with folder structures for doctypes and datatypes and exporting document types with folder structures 
Fixes installing packages while maintaining the exported folder structure
 2016-01-11 22:01:05 +01:00
Sebastiaan Janssen
c783900097 Support folders for package installs (for document types and data types) and imports for document types 2016-01-11 17:52:29 +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
Stephan
20f5560767 Merge pull request #1002 from umbraco/temp-U4-7558-2 
U4-7558 Fix GetAll repository level caching for repositories that return a query result based on the result of GetAll
 2016-01-11 15:14:00 +01:00
Claus
d06003b241 Removing unnecessary settings check. 2016-01-11 14:12:55 +01:00
Claus
cb05f3fe03 Reverted changes no longer needed after work on inherited/nested doctypes. 
Changed default to allow inherited doctypes.
 2016-01-11 14:04:03 +01:00
Claus
ffa7a1457a Merge branch '7.4.0' into temp-U4-7634 
Conflicts:
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-11 13:46:20 +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
a7212f6b60 Changing config setting to the default. 
Referencing wrong config element.
 2016-01-11 12:07:34 +01:00
Claus
6650a72c79 Pass along parentId when getting available compositions since we need it to get available compositions when creating the empty scaffolding. 
Include ancestors in the list of compositions.
Mark ancestors as disabled/locked.
 2016-01-11 12:07:33 +01:00