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

3564 Commits

Author SHA1 Message Date
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Morten Christensen
e4387b8dae Adding some internal bits in the ServiceContextManager and PackagingService 2013-06-25 13:43:57 +02:00
Morten Christensen
188aca499a Merge branch '6.0.7' into 6.1.2 2013-06-25 11:54:24 +02:00
Morten Christensen
3040d362ef Fixes #U4-2361 2013-06-25 11:48:37 +02:00
Shannon
a57aa07721 Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues. 2013-06-25 09:55:45 +10:00
Shannon
f2b8e3407b Merge remote-tracking branch 'origin/6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Mvc/RenderControllerFactory.cs
	src/Umbraco.Web/Mvc/RenderMvcController.cs
	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-06-25 09:41:27 +10:00
Shannon
1ec7cd3b89 Implements: #U4-2342 - IRenderMvcController 2013-06-25 09:33:48 +10:00
Sebastiaan Janssen
bd77463fa4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
 2013-06-24 12:06:58 +02:00
Sebastiaan Janssen
496d51c2a0 Merge pull request #25 from kipusoep/Duplicate-words-domainHelp 
Duplicate words removed
 2013-06-24 01:30:04 -07:00
Stefan Kip
b01b4f7aa7 Forgot to update XML comments 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:29:03 +02:00
Stefan Kip
49a699c858 Added RemovePropertyGroup method 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:28:42 +02:00
Morten Christensen
f68571ef7c Merge pull request #24 from kipusoep/U4-2421-RemovePropertyGroup 
U4-2421 Added RemovePropertyGroup method
 2013-06-24 01:18:21 -07:00
Stefan Kip
6cc1735363 Duplicate words removed 2013-06-23 21:49:43 +02:00
Stefan Kip
d553dfd4b0 Forgot to update XML comments 2013-06-23 20:24:22 +02:00
Stefan Kip
f3e737720b Added RemovePropertyGroup method 2013-06-23 16:38:11 +02:00
Stefan Kip
22cf59345c Removed space before UmbracoModule 
Removed space before UmbracoModule
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2013-06-23 16:02:02 +02:00
Michiel van Oosterhout
16a46a4ea4 Changed default user email address to use the example domain, instead of domain.com 2013-06-23 16:01:04 +02:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally 
(you don't have to re-map your port to the correct folder)
 2013-06-23 15:13:27 +02:00
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
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
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
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