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

12456 Commits

Author SHA1 Message Date
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
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
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
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
Mads Rasmussen
aa7bf0a12e Fix folder selection in media library 2016-01-12 15:49:59 +01:00
Shannon
06b7305d5b removes erroneous null check 2016-01-12 14:39:20 +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
Shannon
f0b0cd1641 adds success checking to the CreateContentTypeContainer results, adds overload instead of optional parameter (breaking change), changes GetContainer(string folderName, int level) to return IEnumerable and changed name to GetContainers - since there could be multiple results for the same container name at a given level. 2016-01-12 14:32:45 +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
Sebastiaan Janssen
9bfac0fdcd Still create the thumbnails upon upload (for backwards compatibility) 2016-01-12 14:20:25 +01:00
Shannon Deminick
83d06bdbcf Merge pull request #994 from umbraco/temp-U4-7612 
U4-7612 Properties Pane is empty when trying to add a new Property to…
 2016-01-12 13:52:07 +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
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
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
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