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

3614 Commits

Author SHA1 Message Date
Simon Busborg
c9ad7659a8 localize components views 2016-01-14 11:44:30 +01:00
Simon Busborg
cc1764dc88 Added localization for controllers (member, media and document types) 2016-01-14 11:44:30 +01:00
Simon Busborg
3888853a40 Added localization to controllers 2016-01-14 11:44:30 +01:00
Simon Busborg
397a9bffb2 localized documentypes, memberstypes and mediatypes, only controllers missing 2016-01-14 11:44:30 +01:00
Simon Busborg
5965552494 localized documenttypes 2016-01-14 11:44:30 +01:00
Simon Busborg
f504a98bcd localized placeholders 2016-01-14 11:44:29 +01:00
Simon Busborg
e47d72a51f Added localize to dialogs 2016-01-14 11:44:29 +01:00
Mads Rasmussen
e334f669b8 localize member types create 2016-01-14 11:44:29 +01:00
Mads Rasmussen
679d9c1e0a translate media types create 2016-01-14 11:44:29 +01:00
Mads Rasmussen
a3d9cbb5fd translate document type editor create dialog 2016-01-14 11:44:29 +01:00
Mads Rasmussen
30c928a734 fix localize bug with reorder and compositions button in content type editor 2016-01-14 11:44:29 +01:00
Mads Rasmussen
9a5f8c2899 start localizing content type editor 2016-01-14 11:44:29 +01:00
Shannon
6ae1806615 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 11:40:06 +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
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
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
bjarnef
06a098215b Add media picker config to restrict the editors to only pick images 2016-01-14 00:36:53 +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
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
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
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
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
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
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
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
Regin Larsen
cb7df58fdd Fix the media picker not rendering when a media item has no image 2016-01-12 16:25:29 +01:00
Mads Rasmussen
aa7bf0a12e Fix folder selection in media library 2016-01-12 15:49:59 +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
Mads Rasmussen
6af28abcab media picker (selected items) add a but more contrast to folders, use flex box 2016-01-12 14:34:28 +01:00
Sebastiaan Janssen
0686d0736a Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2016-01-12 14:27:33 +01:00
Sebastiaan Janssen
43c174368a Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
 2016-01-12 14:27:22 +01:00
Mads Rasmussen
c295e53920 fix media grid in template editor - macro picker 2016-01-12 14:21:12 +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
ee8405ccd0 fixes rebase/merge 2016-01-12 13:32:04 +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
Sebastiaan Janssen
bd5823f0de Merge branch 'U4-7312-2' of https://github.com/Phosworks/Umbraco-CMS into Phosworks-U4-7312-2 2016-01-12 13:24:42 +01:00
Shannon
74d8068de1 Ensures that 2 way binding occurs with the input field so that the outer generate alias updates the inner value and vice versa 2016-01-12 13:21:10 +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
Shannon
c819dabfc0 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 & U4-7696 New content type editor - server side validation fails when creating new document type 2016-01-12 12:21:08 +01:00
Sebastiaan Janssen
fc848e05ee Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2016-01-12 11:39:33 +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