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

15065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
cee20e968f fixes csproj, should no longer reference Zbu DLL 2016-01-15 13:04:18 +01:00
Stephan
fb1a72600e Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002 2016-01-15 12:37:15 +01:00
Stephan
46f3d0c647 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 15:51:53 +01:00
Per Ploug
cc8bb4c031 Fixes issue with Insert RenderSection 
Reported by doug for training build
 2016-01-14 15:37:24 +01:00
Mads Rasmussen
b4bc0ca156 Fixes: RTE media picker 2016-01-14 14:07:46 +01:00
Shannon
6ae1806615 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 11:40:06 +01:00
Shannon
632cdac90b adds translations for content type editor to en_us 2016-01-14 11:36:12 +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
Shannon
58df51cbea fixes pascal case? 2016-01-14 10:52:33 +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
Mads Rasmussen
b116a96058 Fixes: U4-7581 Why so curvy? 2016-01-14 09:52:55 +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
1a8ae67dd1 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2016-01-14 09:04:42 +01:00
Claus
67f8141015 Merge branch 'bjarnef-dev-v7-mediapicker-only-images' into dev-v7 2016-01-14 08:56:34 +01:00
bjarnef
06a098215b Add media picker config to restrict the editors to only pick images 2016-01-14 00:36:53 +01:00
bjarnef
051b320904 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2016-01-13 23:16:10 +01:00
Mads Rasmussen
88f63c7890 only set pointer events to none on search icon, so you can click back in content picker 2016-01-13 21:37:35 +01:00
Shannon Deminick
791c45e085 Merge pull request #1017 from umbraco/temp-deploy-29 
deploy-29 - Sanitize UniqueId
 2016-01-13 19:22:27 +01:00
Shannon
afe2aeda1b Merge branch '7.4.0' into temp-deploy-29 2016-01-13 19:11:20 +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
8b2606f681 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:31:35 +01:00
Shannon
5aab50ba3b Ensures fcnMode and file size maximums are set for the debug web config transform and also for the nuget transform. 2016-01-13 17:27:56 +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
5b9cbae860 Fixes: U4-7712 fcnMode = Single by default 2016-01-13 17:17:39 +01:00
Shannon Deminick
b026245b3f Merge pull request #1007 from umbraco/temp-U4-7634 
Temp u4 7634
 2016-01-13 17:11:59 +01:00
Shannon
20f2773f38 removes the config option registered in the file 2016-01-13 17:09:55 +01:00
Shannon
88b8cfb2bd streamlines how the disabled check boxes work - will perform better too - fixes re-allowing the checkbox on refilter for ancestors. 2016-01-13 16:59:14 +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
6d5435c2e8 Merge branch '7.4.0' into temp-U4-7634 2016-01-13 14:49:37 +01:00
Shannon
1f245ec553 fixes alias validation when saving an existing contenttype 2016-01-13 14:48:19 +01:00
Shannon
17902712ac fixes merge/build 2016-01-13 14:44:17 +01:00
Per Ploug
f4fc47c9cc Strongly Typed models: Always use DoctypeAlias in PascalCase 2016-01-13 14:43:06 +01:00
Per Ploug
7386afcce6 Doctype alias validation always fails 
As it only checks if there is a doctype with the same alias, but does
not test if this doctype is the same as the one currently being saved.
 2016-01-13 14:39:00 +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
Per Ploug
3698ad6164 Revert "Doctype validation on alias fails" 
This reverts commit 3eab76494e.
 2016-01-13 14:29:04 +01:00
Per Ploug
3eab76494e Doctype validation on alias fails 
As it tests if there is a type with alias, but doesnt check if its
itself, validation will never pass after initial save.
 2016-01-13 14:28:44 +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
8857b2db59 Merge branch 'JJCLane-UKFest-6322' into temp-U4-5982 2016-01-13 12:24:00 +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
Per Ploug
849d7c45e0 Fix merge conflicts 2016-01-13 12:18:14 +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
Shannon
40dbcbd7d9 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-13 12:10:22 +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
Per Ploug
22c9f393a0 Update ModelsBuilder nuget reference 2016-01-13 11:45:40 +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