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

14847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
4838bf62f7 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-06 12:01:12 +01:00
Shannon
58c30cd7a6 removes erroneous reverse call 2016-01-06 12:00:50 +01:00
Shannon Deminick
ae1b6d95b8 Merge pull request #990 from umbraco/temp-PVS-Studio 
Temp pvs studio
 2016-01-06 12:00:28 +01:00
Shannon
a2b0f6f7f9 removes erroneous reverse call 2016-01-06 11:59:09 +01:00
Shannon Deminick
c6481f853c Merge pull request #991 from umbraco/temp-U4-7556 
Temp u4 7556
 2016-01-06 11:40:28 +01:00
Shannon
dca6f2b42a fixes build 2016-01-06 10:47:58 +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
Claus
f1cc32771e Using constants instead of -1. 2016-01-06 10:31:21 +01:00
Claus
bfa9c80ed6 Added null checks for elements on import. 2016-01-06 10:27:39 +01:00
Claus
2dcb9c93f7 Dropped these null checks to avoid serializing invalid objects. 2016-01-06 10:26:09 +01:00
Claus
e49033a602 Added import document type option to context menu on root node. 2016-01-06 09:44:12 +01:00
Claus
e489cffa3d Removed unused namespaces and cleanup. 2016-01-06 09:26:58 +01:00
Claus
83963003f9 Ensures XML serializer doesn't fail when trying to serialize null properties. 
Some properties can now be nulls instead of string.Empty when using the new content type editor.
 2016-01-06 09:25:15 +01:00
Claus
2bdea2ef30 Fixes: U4-7556 Export/import document types isn't available in 7.4 
Added in export to context menu on document types using the legacy dialog.
 2016-01-06 09:23:55 +01:00
Sebastiaan Janssen
59fe690a88 Code sample No.10 2016-01-05 23:34:30 +01:00
Sebastiaan Janssen
a15b005d95 Code sample No.6, No.7 2016-01-05 23:22:16 +01:00
Sebastiaan Janssen
b94c396d4e Code sample No.5 2016-01-05 23:20:47 +01:00
Sebastiaan Janssen
8afc4f5ad1 Code sample No.3 2016-01-05 23:15:25 +01:00
Sebastiaan Janssen
f68b2de9e3 Code sample No.2 2016-01-05 23:13:37 +01:00
Sebastiaan Janssen
f4e29d90e0 Code sample No.1 2016-01-05 23:12:09 +01:00
Sebastiaan Janssen
5ad5e945c4 Merge pull request #813 from TimGeyssens/dev-v7 
Fixes U4-7249 Insert Macro split button, when selecting a macro that …
 2016-01-05 19:49:14 +01:00
Sebastiaan Janssen
4ef7b7735e Fixes U4-6510 again as merging PR apparently went wrong 2016-01-05 17:04:11 +01:00
Sebastiaan Janssen
db538d95ba Bumps version 2016-01-05 16:11:59 +01:00
Sebastiaan Janssen
cef7cd1ca7 Merge pull request #981 from umbraco/temp-U4-7583 
U4-7583
 2016-01-05 16:02:51 +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
Shannon
fab30d353a U4-7223 GetCropUrl outputs html entities in url when used in css 2016-01-05 14:54:02 +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
Shannon
18900d0e25 Fixes: U4-6659 Examine: Specific doctype not being indexed 2016-01-05 12:38:13 +01:00
Shannon
d08f4230c8 U4-7538 GetRemainingTimeoutSeconds is double setting the cookie in 7.4 2016-01-05 12:35:06 +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
Shannon
15d06557e9 U4-7605 Colons/Parens Unnecessarily Removed From Data Type Names 2016-01-05 11:42:02 +01:00
Shannon
8d2e708d1c Adds exception handling for the BackOfficeUserStore - this will occur if the external OAuth provider doesn't return the Email or Name correctly, then an exception is swallowed at the service level and the user is not actually created, but the BackOfficeUserStore could not detect this, so it's detecting this now. 2016-01-05 11:36:52 +01:00
Shannon
280573be28 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-05 11:35:35 +01:00
Shannon
415aaf3e2b U4-7477 xss char stripping on data type names is being too agressive 2016-01-05 11:35:24 +01:00
Sebastiaan Janssen
5081027482 Improve batch files: SETLOCAL makes sure we don't change the user's actual path, so no need to revert changes any more either 2016-01-05 11:33:10 +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
Shannon
ac1785bc08 U4-7583 2015-12-28 16:20:48 +01:00
Shannon
66ae47443a Merge branch 'temp-U4-7569' into 7.4.0 2015-12-28 10:37:32 +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