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

12674 Commits

Author SHA1 Message Date
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
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
Mads Rasmussen
61f6ee4436 fix tooltip so it does not get cut off by tree 2016-01-12 11:38:07 +01:00
Mads Rasmussen
87aeaa8afc set lower image max height and width + fix calculation, make use of values in html. 2016-01-12 11:35:36 +01:00
Sebastiaan Janssen
70035632b6 Update ImageProcessor and UrlRewritingNet dependencies 2016-01-12 11:22:49 +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
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
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
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
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
b259b14629 TEMP add ModelsBuilder file to Core (will need to revert and use NuGet package) 2016-01-11 15:18:18 +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
a09d576300 clean using. 2016-01-11 14:13:25 +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
Mads Rasmussen
05c8e10ef8 set disabled state on compositions in overlay + a little bit of restyling 2016-01-11 12:07:39 +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
3676de0fe8 Reverting code to add additional meta data on compositions. 
Added locked compositions to content type object.
Changed UI to use the lockedCompositeContentTypes instead.
 2016-01-11 12:07:36 +01:00
Claus
4db1599bcb Null checks for when using folders. 
Updated tree menu items.
 2016-01-11 12:07:35 +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
Claus
08c4dede08 Output disabled class in backoffice. 2016-01-11 12:07:32 +01:00
Claus
0d37357376 Mark compositions coming from parents with metadata. 
Ensure metadata is not ignored.
 2016-01-11 12:07:31 +01:00
Claus
7a1f4b6b4b include parents as compositions. 2016-01-11 12:06:39 +01:00
Claus
5360bcff52 context menu for creating child doctype. 2016-01-11 12:06:37 +01:00
Claus
e509099cdb Setting for enabling inherited documenttypes. 2016-01-11 12:06:35 +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
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
Shannon
ecd024c462 U4-7681 Legacy CMSNode.Parent uses old SqlHelper API and doesn't keep a reference 2016-01-08 13:59:40 +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