yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
000b2b639f390330d4a83f5ac6fc3e4df45aa283
Umbraco-CMS/src
History
Shannon 000b2b639f Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 
Conflicts:
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
	src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
	src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/UserStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStepAttribute.cs
2014-03-04 11:20:52 +11:00
..
.nuget
Automatically build Belle from build.bat without having to install Node.js on local machine
2014-01-17 14:52:42 +01:00
DesktopMediaUploader
…
packages
…
SQLCE4Umbraco
Gets lots of the new installer logic working
2014-02-26 16:01:31 +01: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-02-25 02:24:45 +11:00
umbraco.controls
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
Umbraco.Core
Gets lots of the new installer logic working
2014-02-26 16:01:31 +01: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-02-21 16:32:53 +11:00
umbraco.interfaces
puts IDataValueSetter back in so it can be used by backwards compatible data
2013-12-05 16:18:45 +11:00
umbraco.MacroEngines
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +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
Updated install steps, classes and logic
2014-03-04 11:16:42 +11:00
Umbraco.Web
Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer
2014-03-04 11:20:52 +11:00
Umbraco.Web.UI
Updates to the installer UI
2014-03-03 08:57:57 +01:00
Umbraco.Web.UI.Client
Updates to the installer UI
2014-03-03 08:57:57 +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
adds additional bat files to the sln files for editing, adds the sandcastle help file config file that can be used to build the docs when sandcastle is installed.
2014-01-24 16:31:49 +11:00
umbraco.sln.DotSettings
…
umbraco.vssscc
…