swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2aae108cb468faa9f6da4606b8741cb9e56f6233
Umbraco-CMS/src
T
History
Shannon 2aae108cb4 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/Security/WebSecurity.cs
2014-02-13 17:21:30 +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
Cleaning up folder structure (U4-56)
2012-06-22 20:39:48 +04:00
packages
Reverted to Newtonsoft.Json 4.5.11
2013-11-13 11:28:14 +11:00
SQLCE4Umbraco
Fixes merge issues with new member stuff regarding the column controlId -> propertyEditorAlias change. Removed the old sqlce sql scripts (
2013-09-11 13:19:35 +10:00
umbraco.businesslogic
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-13 17:21:30 +11:00
umbraco.cms
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-13 16:22:51 +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
fixes some more merge issues
2014-02-13 16:56:23 +11:00
umbraco.datalayer
Obsoletes all legacy installer classes from the legacy data layer.
2013-09-10 11:43:07 +10:00
umbraco.editorControls
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +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
Fixes: U4-2967 Inline macros error out when trying to access the Model
2013-12-06 11:22:16 +11:00
Umbraco.MSBuild.Tasks
Added Umbraco.MSBuild.Tasks to separate solution and configured to build to correct /lib path.
2012-06-27 21:26:38 +04:00
umbraco.providers
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-13 16:22:51 +11:00
Umbraco.Tests
Fixes merge issues
2014-02-13 16:46:52 +11:00
Umbraco.Web
Fixes merge issues
2014-02-13 16:46:52 +11:00
Umbraco.Web.UI
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-13 16:22:51 +11:00
Umbraco.Web.UI.Client
Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0
2014-02-11 14:56:41 +01:00
UmbracoExamine
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
UmbracoExamine.Azure
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
UmbracoExamine.PDF
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
UmbracoExamine.PDF.Azure
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
WebPi
Merge with 6.0.6
2013-05-05 23:39:52 -10:00
SolutionInfo.cs
Reverting SolutionInfo.
2012-11-27 10:05:26 -01:00
Umbraco.MSBuild.Tasks.sln
Added Umbraco.MSBuild.Tasks to separate solution and configured to build to correct /lib path.
2012-06-27 21:26:38 +04:00
umbraco.presentation.targets
Whitespace
2013-11-07 11:24:40 +00:00
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
Added events.Service and xmlhelper.service
2013-08-12 15:17:34 +02:00
umbraco.vssscc
Changes all xslt transforms to use VS transforms. #U4-62
2012-06-22 22:01:16 +04:00