swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,486 Commits 73 Branches 219 Tags
2cd4e9aa991a9e922e07320cc33a973df6f3cc3d
Commit Graph

12924 Commits

Author SHA1 Message Date
Shannon 2cd4e9aa99 makes media types the same as the other content types 2016-02-04 19:26:16 +01:00
Shannon 8e3454d24f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-04 19:17:00 +01:00
Shannon e352c65420 fixes server side validation issue for content types 2016-02-04 19:16:45 +01:00
Sebastiaan Janssen 16caeb96bd Another build warning that can be removed 2016-02-04 18:36:26 +01:00
Sebastiaan Janssen fbd5bdbd1d Surely nobody on their dev machines has the "trust" node in their web.configs any more, no more need to transform that one (gave warning during build.bat) 2016-02-04 18:35:16 +01:00
Shannon 9978b0d8ea Merge branch 'dev-v7' into temp-U4-3447 2016-02-04 18:30:58 +01:00
Shannon 0d9fef5457 changes to use StripWhitespace to fix tests 2016-02-04 18:09:17 +01:00
Shannon Deminick 7449e3bf1d Merge pull request #1096 from umbraco/temp-U4-7895 
U4-7895 - routing fails when path contains dots
 2016-02-04 17:44:39 +01:00
Shannon Deminick e6550b543d Merge pull request #1099 from robertjf/dev-v7 
U4-7897 Minor update to MembershipProviderBase.DecryptPassword() to remove code smell
 2016-02-04 17:38:59 +01:00
Shannon Deminick 1552a08b46 Merge pull request #1097 from umbraco/temp-U4-7887 
U4-7887 - default to database connection timeout
 2016-02-04 17:30:02 +01:00
Robert Foster c9d2d574f8 brought PasswordFormat switch in DecryptPassword in line with other useages. 2016-02-05 03:29:33 +11:00
Sebastiaan Janssen 166429cf68 Fixes the "No license field." error, see: 
https://github.com/npm/npm/issues/4473#issuecomment-103453246
 2016-02-04 16:10:35 +01:00
Mads Rasmussen 48adc259d9 fix content type editor property preview background in firefox 2016-02-04 15:19:20 +01:00
Stephan 42c23dadc9 U4-7887 - default to database connection timeout 2016-02-04 14:51:19 +01:00
Stephan fb9471359c U4-7895 - routing fails when path contains dots 2016-02-04 13:03:53 +01:00
Mads Rasmussen 4e0b018a8b Merge branch 'AndyButland-u4-7840' into dev-v7 2016-02-04 11:46:15 +01:00
Mads Rasmussen f94b5cc462 small fixes to U4-7840 2016-02-04 11:45:31 +01:00
Mads Rasmussen fee98f8144 Merge branch 'u4-7840' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-7840 2016-02-04 11:20:30 +01:00
Shannon Deminick aa31e293ec Merge pull request #1086 from umbraco/temp-U4-7598 
U4-7598 - fix migrations during 4.7 to 7.4 upgrade
 2016-02-04 11:10:45 +01:00
Shannon f8045840ee Merge remote-tracking branch 'origin/master-v7' into dev-v7 2016-02-04 11:04:05 +01:00
Shannon e2985d74e5 U4-7890 XSLT Macro's not working - "Cannot use this obsoleted overload when the current provider" 2016-02-04 11:01:54 +01:00
Mads Rasmussen 7d15b26a8f Fixes: U4-7818 Moved Document Type Reverts to Prior Location on Save 2016-02-04 10:41:06 +01:00
Rune Strand a77ebb1160 Add max resolution for the Image editor in Grid Layouts to avoid performance hit when using high res images. 2016-02-04 10:25:01 +01:00
Claus 6a1e54b221 Fixes: U4-7691 - refactor 2016-02-03 15:39:18 +01:00
Shannon Deminick 864ca4e40e Merge pull request #1094 from umbraco/temp-U4-7691 
Fixes: U4-7691 7.4 beta - Document composition is not working with me…
 2016-02-03 15:26:43 +01:00
Claus 24d42e6bd1 Fixes: U4-7691 7.4 beta - Document composition is not working with media types 
Media type compositions weren't getting added since it only looked up through the content type service.
 2016-02-03 15:02:44 +01:00
Shannon 65c3f8c513 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-03 14:16:38 +01:00
Shannon 1d326a76a3 fixes tab replace 2016-02-03 14:16:24 +01:00
Mads Rasmussen 625f976f14 Merge pull request #1088 from bjarnef/dev-v7-U4-6121 
U4-6121 - Sorting in Related Links was not working correctly
 2016-02-03 14:01:31 +01:00
Shannon 67c3ea7c00 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-03 13:44:03 +01:00
Shannon 797eb34f36 Fixes merge issues and tests 2016-02-03 13:43:51 +01:00
Mads Rasmussen 5f2150ddf7 remove word-break from meta because it hides property alias 2016-02-03 13:28:23 +01:00
Claus c4981b50e5 Merge pull request #1092 from umbraco/temp-U4-7744 
Fixes: U4-7744 Better validation message when Reordering tabs
 2016-02-03 13:21:47 +01:00
Simon Busborg 00a7c97c5e Fixed background and word-break in member type builder 2016-02-03 13:13:56 +01:00
Simon Busborg eb7fa9528a Merge pull request #1081 from umbraco/temp-U4-7675 
Fixes: U4-7675 Changing doc type icon doesn't set dirty property for form
 2016-02-03 12:55:12 +01:00
Claus 27d2b631a9 Merge pull request #1080 from umbraco/temp-U4-7871 
Fixes: U4-7871 Media picker - add functionality to go to media item w…
 2016-02-03 12:51:08 +01:00
Claus bf1086ca39 Merge pull request #1089 from umbraco/temp-U4-7884 
Fixes: U4-7884 Prevent new content type editor form from saving when hitting enter from inputs
 2016-02-03 12:44:55 +01:00
Shannon e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Shannon aed4649ff5 changes version to RC1 2016-02-03 12:16:07 +01:00
Shannon Deminick 36119848e7 Merge pull request #1085 from umbraco/temp-U4-7861 
U4-7861 - fix moving a content type
 2016-02-03 12:13:31 +01:00
Shannon Deminick 8080746004 Merge pull request #1091 from umbraco/temp-U4-7885 
U4-7885 - fix YSOD when saving a member type
 2016-02-03 11:59:24 +01:00
Mads Rasmussen edaa335b18 Fixes: U4-7744 Better validation message when Reordering tabs 2016-02-03 11:55:19 +01:00
Simon Busborg ae9fba87b5 Removed white background from member types builder 2016-02-03 11:46:33 +01:00
Claus 076efad616 Merge pull request #1084 from umbraco/temp-U4-7713 
U4-7713 - fix CountPublished
 2016-02-03 11:45:15 +01:00
Stephan df3aaf43d3 U4-7885 - fix YSOD when saving a member type 2016-02-03 11:33:34 +01:00
Shannon 5d5c6ed33a fixes ysod with media types and member types 2016-02-03 11:21:01 +01:00
Shannon 78c2708116 U4-3447 Nuget package does not install correctly with "Web Site" projects 2016-02-03 10:39:53 +01:00
Mads Rasmussen e22c6d9c04 fix member types html indention 2016-02-03 10:16:39 +01:00
Shannon 08e9579481 U4-7863 Remove Nuget requirement: Microsoft.Net.Http - this is not used, nor is it required (it also installs a bunch of other packages we don't need) 2016-02-03 10:14:53 +01:00
Mads Rasmussen 61ba602b4b prevent enter submit in member types 2016-02-03 10:05:01 +01:00