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

15038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Mads Rasmussen
6d47d76199 Merge pull request #1012 from umbraco/temp-U4-7696-U4-7371 
U4-7371 New Content type editor - Better validation when trying to create a new document/media/member type with the same name as an existing one
 2016-01-13 10:58:39 +01:00
Mads Rasmussen
eb6ae95039 Merge pull request #1015 from umbraco/temp-U4-7561 
U4-7561 Backoffice Media Section should provide information on physic…
 2016-01-13 10:40:54 +01:00
Shannon
5e461b0cec adds packaging test 2016-01-13 10:29:44 +01:00
Shannon
d6a49f275f adds test that fails - need to fix it now 2016-01-13 10:29:26 +01:00
Shannon
2cc0df3a3c Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2016-01-13 10:25:17 +01:00
Shannon
81ba2b8981 adds packaging test 2016-01-13 10:25:07 +01:00
Mads Rasmussen
03751edf40 Merge pull request #1016 from umbraco/temp-U4-7630 
Fixes: U4-7630 Cannot save a document type when it has a date picker …
 2016-01-13 10:23:31 +01:00
Mads Rasmussen
f5f3126e44 move form outside directive to only disable validation in content type editor 2016-01-13 10:22:57 +01:00
Claus
646ab931b0 Clicking an image in the media picker opened by RTE, should select the image instead of showing details. 2016-01-12 21:58:37 +01:00
Claus
7fd3d58def Fixes: U4-7630 Cannot save a document type when it has a date picker required property with the new property type editor in 7.4 
Directive for disabling validation on forms.
Passing on required validation from settings to textarea and textbox.
Wrapping property editor preview in disabled validation form.
 2016-01-12 21:40:09 +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
6a6939d8c8 Merge pull request #1013 from umbraco/temp-U4-7578-2 
Fixes: U4-7578 Can't pick folders in any media picker in 7.4 beta
 2016-01-12 17:45:03 +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 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