yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2792937b17f599e6559827b63a2c9004bb1bc1e2
Umbraco-CMS/src
History
Shannon 2792937b17 Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447 
Conflicts:
	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
2014-03-20 13:10:39 +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
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-03-18 18:47:49 +11:00
umbraco.cms
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-19 09:34:37 +11:00
umbraco.controls
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-17 14:15:14 +11:00
Umbraco.Core
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-20 10:38:40 +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-19 18:55:20 +11:00
umbraco.interfaces
…
umbraco.MacroEngines
U4-4373, U4-4374 - finalize fixes
2014-03-17 15:44:16 +01:00
umbraco.macroRenderings
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-17 14:15:14 +11:00
Umbraco.MSBuild.Tasks
…
umbraco.providers
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-18 18:53:04 +11:00
Umbraco.Tests
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-20 09:54:13 +11:00
Umbraco.Web
Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447
2014-03-20 13:10:39 +11:00
Umbraco.Web.UI
Make sure we use the latest ImageProcessor version in VS as well, not just in the nuget package.
2014-03-19 19:56:48 +01:00
Umbraco.Web.UI.Client
Fixes: U4-4481 Image cropper pre value editor doesn't validate properly
2014-03-20 13:03:30 +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
…