swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
62d4bff8aac3d8975d6e05fa1d2eb4ccb60cbe4a
Umbraco-CMS/src
T
History
Shannon 62d4bff8aa Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
2014-03-13 11:11:51 +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
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
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-13 14:08:23 +11:00
Umbraco.Core
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-13 11:11:51 +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
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-03-11 14:47:00 +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-25 02:24:45 +11:00
Umbraco.Tests
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-13 11:11:51 +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
fix typos, thousands separator and casing of installer facts
2014-03-12 11:05:50 +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
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