yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7e1b20e60021f39ccc01c43a6b8385992bcb5915
Umbraco-CMS/src
History
Shannon 7e1b20e600 Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
2015-01-07 16:13:47 +11:00
..
.nuget
…
packages
…
SQLCE4Umbraco
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
2014-11-26 10:43:46 +01:00
umbraco.businesslogic
Fixes remaining tests
2015-01-07 15:36:17 +11:00
umbraco.cms
Fixes up some things from PR 610 and fixes up quoted values when using the Insert.IntoTable migration.
2015-01-06 13:44:42 +11:00
umbraco.controls
Fixes: U4-5996 CDF reference issue
2014-12-11 17:55:53 +11:00
Umbraco.Core
Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0
2015-01-07 16:13:47 +11:00
umbraco.datalayer
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
2014-11-26 10:43:46 +01:00
umbraco.editorControls
Fixes: U4-5996 CDF reference issue
2014-12-11 17:55:53 +11:00
umbraco.interfaces
…
umbraco.MacroEngines
Fixes: U4-5943 Cannot render a macro on a virtual page when using UmbracoVirtualNodeRouteHandler and assigning virtual Ids
2015-01-02 15:34:51 +11:00
umbraco.macroRenderings
…
Umbraco.MSBuild.Tasks
…
umbraco.providers
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
2014-11-26 10:43:46 +01:00
Umbraco.Tests
Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0
2015-01-07 16:13:47 +11:00
Umbraco.Web
Merge branch 'dev-v7' into 7.3.0
2015-01-07 15:54:08 +11:00
Umbraco.Web.UI
Merge branch 'dev-v7' into 7.3.0
2015-01-07 15:54:08 +11:00
Umbraco.Web.UI.Client
Merge branch 'dev-v7' into 7.3.0
2015-01-07 15:54:08 +11:00
UmbracoExamine
Fixes remaining tests
2015-01-07 15:36:17 +11:00
UmbracoExamine.Azure
…
UmbracoExamine.PDF
WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility.
2014-12-11 15:58:54 +11:00
UmbracoExamine.PDF.Azure
…
WebPi
…
SolutionInfo.cs
…
Umbraco.MSBuild.Tasks.sln
…
umbraco.presentation.targets
Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed)
2014-10-19 13:00:54 +02:00
umbraco.sln
No need to start a webserver for the Umbraco.Web.UI.Client project (correct me if I'm wrong)
2014-12-18 13:55:50 +01:00
umbraco.sln.DotSettings
…
umbraco.vssscc
…