yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,945 Commits 4 Branches 7 Tags
3131096ffb236f47706741c7bd71d0a5b06f95ef
Commit Graph

14945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Sebastiaan Janssen
70035632b6 Update ImageProcessor and UrlRewritingNet dependencies 2016-01-12 11:22:49 +01:00
Mads Rasmussen
1bf470c0aa Merge pull request #1011 from umbraco/temp-U4-7578-3 
Fixes: U4-7578 disable folder selection in rte and markdown editor
 2016-01-12 10:52:11 +01:00
Claus
c6a7678ae8 Fixes: U4-7578 Can't pick folders in any media picker in 7.4 beta 
Dialog option for disabling folder select on media pickers.
Added the option to Markdown and RTE.
 2016-01-12 10:36:21 +01:00
Claus
b1f12ec864 Merge branch 'temp-U4-7578' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
 2016-01-12 10:01:03 +01:00
Shannon Deminick
759c925fa0 Merge pull request #1006 from umbraco/temp-U4-7694 
Fixes: U4-7694 Make media folders work as list view and media items - click folder to select and click folder name to open
 2016-01-11 18:34:00 +01:00
Shannon
e17c900beb fixes merge/rebase with latest other pr merge 2016-01-11 17:21:59 +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
6f6c2a3d90 changing bindings to be compatible with other PR. 2016-01-11 17:16:19 +01:00
Mads Rasmussen
ce382c42c4 Fixes: U4-7639 show another message when first document type 2016-01-11 17:16:18 +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
Shannon Deminick
043fb99020 Merge pull request #996 from umbraco/temp-U4-7593 
fixes: U4-7593 Removing a composite from an existing doctype - Need b…
 2016-01-11 17:15:17 +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
81395169ba line endings 2016-01-11 12:02:33 +01:00
Mads Rasmussen
cd4db879b7 better function names 2016-01-11 11:21:35 +01:00
Mads Rasmussen
fdc654058c Fixes: U4-7694 Make media folders work as list view and media items - click folder to select and click folder name to open 2016-01-11 11:12:53 +01:00
Simon Busborg
323257a0bf Merge pull request #1005 from umbraco/temp-U4-7568 
Fixes: U4-7568 Only set focus on header name input when creating new node
 2016-01-11 09:10:05 +01:00
Mads Rasmussen
f9fa81bf13 only focus editor name when empty - new nodes 2016-01-10 19:23:22 +01:00
Mads Rasmussen
e20a152e4f Fix bug where editor name was not always focused 2016-01-10 19:22:44 +01:00
Mads Rasmussen
16e79c98a6 Merge pull request #1003 from umbraco/temp-U4-7638 
Fixes: U4-7638 Make larger area of tree node clickable
 2016-01-10 13:21:44 +01:00
Mads Rasmussen
bf06e1e1e8 Fixes: U4-7674 Fixed header for doc type "Compositions" and "Reorder" links 2016-01-09 22:00:19 +01:00
Mads Rasmussen
7d49c49bab Fixes: U4-7651 Hide button spinner, when validation errors occur for datatype 2016-01-09 20:53:56 +01:00
Mads Rasmussen
d4a1eea8e5 Fixes: U4-7575 Deselecting items in the MNTP are not deselected 2016-01-09 20:49:54 +01:00
Simon Busborg
a6cf13d835 Positioned loader under tree-item 2016-01-08 13:10:04 +01:00
Shannon
273d2e2a2b Merge branch 'temp-U4-7635' into 7.4.0 2016-01-08 12:29:35 +01:00
Shannon
4cb523fb66 Added tests for ContentTypeServiceExtensions 2016-01-08 12:29:11 +01:00
Simon Busborg
e731831658 Fixes: U4-7638 Make larger area of tree node clickable 2016-01-08 11:41:17 +01:00
Mads Rasmussen
d1059c9dbe Merge pull request #986 from umbraco/temp-U4-7619 
U4-7619
 2016-01-08 11:34:33 +01:00
Mads Rasmussen
14db03e718 set min size on media, set background pattern on media to make cleaner grid, streamline media library and media picker select functionality with list view. 2016-01-08 10:12:02 +01:00
Mads Rasmussen
5dbda59f9d Merge pull request #1001 from umbraco/temp-U4-7564 
Fixes: U4-7564 "Save and publish" button menu skewed [7.4.0-beta]
 2016-01-07 21:35:02 +01:00
Mads Rasmussen
e64f0fc5c5 Fixes: U4-7654 Recycle bin now display a input instead of a readonly heading 2016-01-07 21:10:04 +01:00
Shannon
02b6f94a1b moves the current logic into a re-usable ext method 2016-01-07 19:46:22 +01:00
Shannon
ba91bf0b9c missing a file save 2016-01-07 19:33:55 +01:00
Shannon
2b13297c36 Changes method name to be shorter and makes internal instead of protected. 2016-01-07 19:27:59 +01:00
Shannon
fb5faa3db7 Fixes tests, adds LanguageId to the interface 2016-01-07 18:59:59 +01:00
Shannon
d7a142e724 Refactors DictionaryItem and DictionaryTranslation so that the attached ILanguage entity is not cached nor cloned. This will save on lots of memory and cloning cycles especially if there are quire a few dictioanry items. Unfortunatley to achieve this requires a not so pretty hack where we need to assign an internal callback to the model so it knows how to retrieve the language when it needs it. In v8, the ILanguage entity will not be attached at all. This also fixes a cache refresher issue for when a language is deleted -> all dictionary cache must be removed. This commit also changes a method name: ClearAllIsolatedCacheByRepositoryEntityType 2016-01-07 18:44:04 +01:00
Shannon
63785ae70f Adds cache policy tests 2016-01-07 17:54:55 +01:00
Shannon
68aa6ff093 Moves repository caching logic into new CachePolicies. 2016-01-07 16:31:20 +01:00
Simon Busborg
896eda1022 Fixes firefox bug where it ignores inline elements width 2016-01-07 12:58:28 +01:00