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

5542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
d09e283900 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.hgtags
 2013-06-23 15:00:14 +02:00
Sebastiaan Janssen
507c6c23b9 If you never had VS2010 installed, the build now works, checking if the Publishing Tasks dll exists now 2013-06-23 14:57:53 +02:00
Sebastiaan Janssen
3daf936623 Remove hgignore files 2013-06-23 14:52:45 +02:00
Sebastiaan Janssen
e93c910347 Fix more unit tests 2013-06-22 17:32:22 +02:00
Sebastiaan Janssen
7139e30296 Don't delete the config file directory, it can't sometimes 
For now, don't delete umbracoSettings.config either, it makes a lot of tests fail
 2013-06-22 15:53:10 +02:00
Sebastiaan Janssen
df1940a01c Fix unit test by ensuring config file is copied if it doesn't exist 2013-06-22 15:07:40 +02:00
Sebastiaan Janssen
aafb5a0285 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
 2013-06-22 14:22:43 +02:00
Sebastiaan Janssen
033f981718 Fix unit test 2013-06-22 14:19:22 +02:00
Sebastiaan Janssen
5bd55bdd09 Merge branch '6.0.7' into 6.1.2 2013-06-21 17:33:42 +02:00
Sebastiaan Janssen
76358e3e13 U4-2374 Mono port to do: dealing with empty string 2013-06-21 17:29:55 +02:00
Sebastiaan Janssen
35c0eb3b0c U4-2377 Mono port to do: Universal currency character does not work as split character unless given in unicode. 2013-06-21 17:22:13 +02:00
Sebastiaan Janssen
7fad8ca98b U4-2378 Mono port to do: TypeFinder needs exclusions for Monodevelop Nunit 2013-06-21 17:15:42 +02:00
Sebastiaan Janssen
a2da27121e U4-2335 [Regression] YSOD when editing stylesheet property on 6.0.6 2013-06-21 17:00:40 +02:00
Sebastiaan Janssen
23ec07276a U4-2369 Wrong path for Umbraco/Config/Lang/xx.xml for publish notification mail 2013-06-21 16:56:59 +02:00
Sebastiaan Janssen
96cec0b407 U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 2013-06-21 16:30:44 +02:00
Sebastiaan Janssen
47b94e68e3 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-21 15:26:10 +02:00
Sebastiaan Janssen
0f4b1752e0 U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run 2013-06-21 15:25:46 +02:00
Shannon
eac66f5696 Merge branch '6.0.7' into 6.1.2 2013-06-21 13:00:56 +10:00
Shannon
b2c604f7b3 updated ignore 2013-06-21 11:26:23 +10:00
Shannon
3f626b444f re-enables CDF logger 2013-06-21 10:55:38 +10:00
Shannon
c5b8931aa6 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-21 10:50:35 +10:00
Shannon
818d22ba61 updates CDF config examples (#U4-2331) 2013-06-21 10:49:27 +10:00
Shannon
f9902964b0 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web.UI/config/ExamineIndex.config
 2013-06-21 09:20:53 +10:00
Shannon
27fdb1ebab removed custom dashboard, re-put back in the external index (must have got removed by accident) 2013-06-21 09:19:50 +10:00
Shannon
1368ba8dc9 Fixes unit tests 2013-06-21 08:47:01 +10:00
Shannon
3618722574 Fixed some merging issues. 2013-06-20 15:57:23 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon
cb592d687c Merge branch '6.0.7' into 6.1.2 2013-06-20 11:26:01 +10:00
Shannon
2161ec98b0 Fixes: #U4-2324 - Umbraco.Field will now work with custom routed pages. 2013-06-20 11:25:33 +10:00
Shannon
5a6ee168c3 Merge branch '6.0.7' into 6.1.2 2013-06-20 10:08:50 +10:00
Shannon
52292cab60 Fixes: #U4-2403 2013-06-20 10:08:02 +10:00
Stephan
2933c879e1 U4-2327 - fix PublishedContentRequest redirect vs. permanent 2013-06-19 20:30:43 +02:00
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
WadeKallhoff
a6768263d3 image thumb extension fix 2013-06-19 18:11:28 +02:00
kensykora
e66306978a macro rendering fix 2013-06-19 17:59:30 +02:00
Phil Dye
7f22809ebf U4-1478 Create button still visible when not active 2013-06-19 17:55:00 +02:00
Edwin de Koning
302ebde422 Translating the word "or" 2013-06-19 16:28:58 +02:00
Murray@tbpc10.terabyte.co.nz
cf5624f377 #U4-2326 Added Try Catch for PlatformNotSupportedException 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 16:24:09 +02:00
Morten Bock
f386c9d024 U4-1226 Umbraco:image control 2013-06-19 16:18:15 +02:00
Edwin de Koning
530fcf0ea3 Fixes U4-2261 2013-06-19 16:04:56 +02:00
Sebastiaan Janssen
26e4091f28 Due to previous fix we don't need to sort individually any more 
(see changeset 32f86f750e)
 2013-06-19 16:01:50 +02:00
Dennis Ravn Pedersen
32f86f750e Query would reverse logic sorting of children. Would make move operations ignore sorting. 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 15:36:08 +02:00
Sebastiaan Janssen
ebad631140 Merge branch '6.0.7' into 6.1.2 2013-06-19 15:16:32 +02:00
Sebastiaan Janssen
b8304c03ee Merge branch '6.0.7' of https://github.com/bokmadsen/Umbraco-CMS into bokmadsen-6.0.7 2013-06-19 14:50:41 +02:00
Sebastiaan Janssen
556c2d625f Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-06-19 14:42:14 +02:00
Sebastiaan Janssen
aaa4469def Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-19 14:36:17 +02:00
Sebastiaan Janssen
baa0069262 Merge branch 'master' into 6.0.7 
Conflicts:
	README.md
 2013-06-19 14:22:57 +02:00
Sebastiaan Janssen
9ac4c7aef5 Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS 2013-06-19 14:14:51 +02:00
Sebastiaan Janssen
cb2a35594f Merge branch '6.0.6' 
Conflicts:
	src/Umbraco.Core/TypeFinder.cs
 2013-06-19 14:13:09 +02:00