yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c29dbf444afc4b8646b6d30f2bc0e5b140b2e4c3
Umbraco-CMS/src
History
Shannon c29dbf444a Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
2014-03-15 19:02:59 +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-13 18:43:40 +11:00
umbraco.controls
…
Umbraco.Core
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-15 19:02:59 +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-03-14 19:33:53 +11:00
Umbraco.Tests
fixes typo
2014-03-14 19:34:09 +11:00
Umbraco.Web
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-14 19:33:53 +11:00
Umbraco.Web.UI
Exception is thrown if trying to run mysql in med trust. Migrations arranged to execute schema migrations first and then data migrations. If a schema migration fails it will attempt to run the downgrade scripts of the migrations if running mysql since schema changes aren't supported in transactions. Updated all sql syntax providers to try to return only the column indexes, not key indexes. Updates the db version checker to include errors for all missing columns, indexes and constraints in the db and vice versa in the schema.
2014-03-14 13:04:20 +11:00
Umbraco.Web.UI.Client
Merge pull request #317 from BatJan/patch-1
2014-03-14 11:35:10 +11: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
…