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

3575 Commits

Author SHA1 Message Date
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
Simon Busborg
dd72f2fe3a Fixes: U4-7625 Rounded corners for datepicker dialog 2016-01-04 10:11:04 +01:00
Simon Busborg
d78428213e Fixed: U4-7626 Ensure consistency in context menu items 2016-01-04 10:04:37 +01:00
Simon Busborg
101c5e63a9 Fixes: U4-7606 Set focus on input when clicking search icon 2016-01-04 10:00:16 +01:00
Rune Hem Strand
12e98fb54e Fixes U4-7619 
Allows for correct aspect ratio when resizing a crop
 2015-12-30 14:16:00 +01:00
Per Ploug
88f6722b9d ContentType EditController typo 2015-12-30 10:40:48 +01:00
Shannon
1040700bfd Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/ContentTypeController.cs
 2015-12-29 11:26:15 +01:00
Shannon Deminick
198033ff22 Merge pull request #974 from umbraco/temp-U4-7569 
Temp u4 7569
 2015-12-28 10:36:18 +01:00
Mads Rasmussen
c11b09d2d6 Merge pull request #975 from umbraco/temp-U4-7573 
Fix for http://issues.umbraco.org/issue/U4-7573
 2015-12-23 11:11:10 +01:00
Mads Rasmussen
c7e9e99373 Merge pull request #978 from umbraco/temp-U4-6854 
Fix for http://issues.umbraco.org/issue/U4-6854
 2015-12-23 09:53:53 +01:00
Mads Rasmussen
292887d9eb Merge pull request #967 from umbraco/temp-U4-7571 
Fix for http://issues.umbraco.org/issue/U4-7571
 2015-12-23 09:35:29 +01:00
Simon Busborg
7a112c43d8 Fix for http://issues.umbraco.org/issue/U4-6854 
Grid editor - insert control: Make blue area clickable
 2015-12-22 20:05:29 +01:00
Jeremy Pyne
9649e6d9bf Add code to manually update the model. 2015-12-22 11:17:53 -05:00
Jeremy Pyne
0d7363af23 Fix for MarkdownEditor no seeing changes from button clicks. 2015-12-22 10:47:04 -05:00
Simon Busborg
552cbada88 Fix for http://issues.umbraco.org/issue/U4-7573 2015-12-22 15:07:57 +01:00
Shannon Deminick
7883a3720b Merge pull request #964 from umbraco/temp-U4-6890 
U4-6890 New content type editor: Missing sorting of properties from s…
 2015-12-22 15:04:47 +01:00
Mads Rasmussen
bb5812ba54 remove front-end sorting of properties in content types 2015-12-22 14:46:57 +01:00
Simon Busborg
a0c552d289 Moved media "remove file" and "Choose file" on one line. UI Sugar 2015-12-22 14:26:52 +01:00
Mads Rasmussen
8eb3122409 remove fadeOut class from load indicator directive to make in animate more than once 2015-12-22 14:08:31 +01:00
Mads Rasmussen
89e2bb1d0a Fixes: U4-7569 Listview should not loose focus after filtering and U4-7582 When searching in media with no results, show a no results message + make empty state directive 2015-12-22 14:07:12 +01:00
Shannon Deminick
41879e28ef Merge pull request #971 from umbraco/temp-U4-7567 
Fix for http://issues.umbraco.org/issue/U4-7567
 2015-12-22 11:26:05 +01:00
Simon Busborg
2bf83c2cce Added proper hierachy to intro screen 2015-12-22 10:46:21 +01:00
Simon Busborg
42db79bdf6 Added .btn-link -underline for dashboard links, removed global link styling from umb-dashboard-control 
Added .btn-link -underline to dashboards
 2015-12-22 10:39:49 +01:00
Simon Busborg
e77e0c6704 added posibility to use border radius variables 2015-12-21 15:52:13 +01:00
Simon Busborg
f5fc4eacd4 Fix for http://issues.umbraco.org/issue/U4-7566# 2015-12-21 15:33:20 +01:00
Simon Busborg
0ba9054412 Removed border-radius 2015-12-21 15:25:22 +01:00
Simon Busborg
9bbaf4a20e Removed rounded corners on elements 2015-12-21 15:21:11 +01:00
Mads Rasmussen
6a9f6bc91b make it possible to select folders in media picker, fix issue with deselecting image in some cases + a bit code clean up. 2015-12-21 14:48:46 +01:00
Simon Busborg
8e3b6ffd59 added blue hover state 2015-12-21 12:38:22 +01:00
Simon Busborg
4a660433de Removed hover state 2015-12-21 12:37:21 +01:00
Simon Busborg
3a640c7a78 Added hover state 2015-12-21 12:32:15 +01:00
Simon Busborg
632bccb9dd Added new mediapicker ui for consistency through the backoffice, removing text-decoration problem 2015-12-21 12:22:14 +01:00
Wincent
53f9e104ec Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into U4-7312-2 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs - Removed changes from upstream
 2015-12-19 11:16:30 +01:00
Simon Busborg
8008a3b7c5 Fix for http://issues.umbraco.org/issue/U4-7574 2015-12-18 11:22:40 +01:00
Simon Busborg
da02b1330c Fix for http://issues.umbraco.org/issue/U4-7572 2015-12-18 10:33:22 +01:00
Mads Rasmussen
8830faedfd remove gradient from orange buttons 2015-12-17 14:19:34 +01:00
Mads Rasmussen
087ad2e1fa grid: remove the + from add content button 2015-12-17 14:01:33 +01:00