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

3348 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Simon Busborg
a6cf13d835 Positioned loader under tree-item 2016-01-08 13:10:04 +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
Simon Busborg
896eda1022 Fixes firefox bug where it ignores inline elements width 2016-01-07 12:58:28 +01:00
Simon Busborg
4139972f72 Fixes: U4-7564 "Save and publish" button menu skewed [7.4.0-beta] 
So I tested it on a Surface and got the same result as you. We get this "bug" because of how bootstrap handles dropdowns on mobile/tablets. Bootstrap detect Suface as a tablet, and therefor pushed an element to the DOM called `dropdown-backdrop`. Disabling this will fix the "bug". But we need to be aware of this taken from http://getbootstrap.com/javascript/

>''"On mobile devices, opening a dropdown adds a `.dropdown-backdrop` as a tap area for closing dropdown menus when tapping outside the menu, a requirement for proper iOS support. This means that switching from an open dropdown menu to a different dropdown menu requires an extra tap on mobile."''

Since it's a very old Bootstrap we're using I took the liberty to just add `.btn-group .dropdown-backdrop` `display: none` so that the element wouldn't appear in the DOM anymore.
 2016-01-07 11:20:13 +01:00
Mads Rasmussen
2f6cfaf99c prevent save when an overlay is open 2016-01-07 09:49:13 +01:00
bjarnef
ba0da15f7f Set focus on input by clicking label 2016-01-07 01:04:55 +01:00
Mads Rasmussen
2a0287f5ad Fixes: U4-7653 List view - input types 2016-01-06 19:29:30 +01:00
Mads Rasmussen
7cb4a47f3e Fixes: U4-7653 List view - can't remove custom layouts 2016-01-06 19:00:23 +01:00
Mads Rasmussen
7b33f85a5d fixes: U4-7593 Removing a composite from an existing doctype - Need better UI/error reporting (your data goes with it!) 2016-01-06 15:15:50 +01:00
Shannon
b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
 2016-01-06 10:46:38 +01:00
Shannon
726416fe0c Fixes: U4-7624 Datepicker Sql server error 
Since we are not saving the formatted value, don't try parsing the date with formatting config.
Added in explicit parsing format compatible with the one used when saving the value, just to ensure parsing is done the same way.
 2016-01-05 15:47:42 +01:00
Simon Busborg
ac653e7f6d Fixes: U4-7636 Change re-use back to Reuse 2016-01-05 15:35:42 +01:00
Simon Busborg
2dc2199390 Added bold font in search fields to support new font heirachy 2016-01-05 15:29:15 +01:00
Shannon Deminick
1957d8bb3b Merge pull request #928 from kiasyn/patch-1 
U4-7400 - Datepicker is not updating scope model value in time for 3r…
 2016-01-05 15:19:31 +01:00
Claus
bfc7cbccc1 Merge pull request #988 from umbraco/temp-U4-7584 
Fixes: U4-7584 can't preview any content due to external google font
 2016-01-05 13:08:37 +01:00
Simon Busborg
44014fea70 Fixes: U4-7584 can't preview any content due to external google font 2016-01-05 11:49:30 +01:00
Mads Rasmussen
cd66bbfb0f Fixes: U4-7629 Help-dialog doesn't open, when user-dialog is open 2016-01-05 11:46:02 +01:00
Claus
69233fbead Merge pull request #987 from umbraco/temp-U4-7590 
Fixes: U4-7590 List view layout cookie: Change to use local storage a…
 2016-01-05 09:43:54 +01:00
Simon Busborg
5f4309d2ca Fixes: U4-7590 List view layout cookie: Change to use local storage and clean up entry if its back to default layout. 2016-01-05 09:23:27 +01:00
Claus
3a4f0f4c11 Fixes: U4-7624 Datepicker Sql server error 
Since we are not saving the formatted value, don't try parsing the date with formatting config.
Added in explicit parsing format compatible with the one used when saving the value, just to ensure parsing is done the same way.
 2016-01-04 11:56:59 +01:00
Simon Busborg
deb1f2f343 Fixes: U4-7337 Change Wording in Doctype Editor 2016-01-04 11:18:34 +01:00
Simon Busborg
460f0e7528 Fixes: U4-7607 Listview jump a few pixels down, when selecting items 2016-01-04 10:20:18 +01:00