yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9d7d8664672570a4a1e906f8b8dfee2b9711415f
Umbraco-CMS/src
History
Shannon 9d7d866467 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2014-03-12 18:44:54 +11:00
..
.nuget
…
DesktopMediaUploader
…
packages
…
SQLCE4Umbraco
Updates some tests and fixes a couple things
2014-03-04 16:40:23 +11:00
umbraco.businesslogic
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
umbraco.cms
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-10 17:30:46 +11:00
umbraco.controls
…
Umbraco.Core
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-12 18:44:54 +11:00
umbraco.datalayer
Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0
2014-02-18 18:03:29 +11:00
umbraco.editorControls
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
umbraco.interfaces
…
umbraco.MacroEngines
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-11 14:47:00 +11:00
Umbraco.MSBuild.Tasks
…
umbraco.providers
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-25 02:24:45 +11:00
Umbraco.Tests
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-11 15:02:48 +11:00
Umbraco.Web
Fixes: U4-4395 YSOD when creating membergroup
2014-03-12 15:08:55 +11:00
Umbraco.Web.UI
Temporary fix to at least have a scrollbar when protecting a page (only added inline style, and
2014-03-11 18:47:50 +01:00
Umbraco.Web.UI.Client
Really... nobody noticed "MEH"?
2014-03-12 00:30:25 +01:00
UmbracoExamine
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
UmbracoExamine.Azure
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
UmbracoExamine.PDF
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
UmbracoExamine.PDF.Azure
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
WebPi
…
SolutionInfo.cs
…
Umbraco.MSBuild.Tasks.sln
…
umbraco.presentation.targets
…
umbraco.sln
…
umbraco.sln.DotSettings
…
umbraco.vssscc
…