yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b420941ff4467ffe8db8f1f4d53cd9f69283e7e1
Umbraco-CMS/src
History
Shannon b420941ff4 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
2014-04-28 12:26:21 +10:00
..
.nuget
…
DesktopMediaUploader
…
packages
…
SQLCE4Umbraco
Updates some tests and fixes a couple things
2014-03-04 16:40:23 +11:00
umbraco.businesslogic
Fixes: U4-4610 Unmapped members in Automapper
2014-04-14 15:20:02 +10:00
umbraco.cms
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
2014-04-24 16:33:04 +10: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.2
2014-04-28 12:26:21 +10:00
umbraco.datalayer
Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0
2014-02-18 18:03:29 +11:00
umbraco.editorControls
Replaced "retreive" with "retrieve".
2014-03-25 20:32:39 -07:00
umbraco.interfaces
…
umbraco.MacroEngines
Upgrade to Json.Net 6.0.2
2014-04-08 11:37:40 +02: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.2
2014-04-24 16:33:04 +10:00
Umbraco.Tests
fix merge issues
2014-04-23 20:54:31 +10:00
Umbraco.Web
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
2014-04-24 16:33:04 +10:00
Umbraco.Web.UI
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
2014-04-24 16:33:04 +10:00
Umbraco.Web.UI.Client
Updates an error msg for media resource, performs a null check
2014-04-24 11:58:18 +10:00
UmbracoExamine
Fixes: U4-459 Public Access permissions not set on distributed servers
2014-03-27 16:11:34 +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
Update for WebPI
2014-04-09 09:35:02 +02:00
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
…