yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f36574fef3b41b45f3439a9355fd7d912317b2c5
Umbraco-CMS/src
History
Shannon f36574fef3 Merge branch '7.3.0' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
2015-06-08 18:03:39 +02:00
..
.nuget
updates nuget.exe ... we should really use the methodolgy that we've got in the new identity projects where we don't commit this file, instead we go get the latest from the web during build (but that would probably mean moving to powershell)
2015-05-05 11:58:33 +10:00
packages
Completes: U4-6474 Update to latest examine v0.1.62
2015-04-09 15:33:58 +10:00
SQLCE4Umbraco
Merge branch 'dev-v7' into 7.3.0
2015-05-11 12:26:53 +10:00
umbraco.businesslogic
Completes: U4-1979 Some legacy business logic APIs do not wrap the new Service APIs - gets permissions wrapped too
2015-05-18 19:34:01 +10:00
umbraco.cms
Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
2015-06-03 15:08:47 +02:00
umbraco.controls
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
Umbraco.Core
Merge branch '7.3.0' into dev-v7-contenttypeeditor
2015-06-08 18:03:39 +02:00
umbraco.datalayer
Merge branch 'dev-v7' into 7.3.0
2015-05-11 12:26:53 +10:00
umbraco.editorControls
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
umbraco.interfaces
Merge branch 'dev-v7' into 7.3.0
2015-05-05 12:27:01 +10:00
umbraco.MacroEngines
Fixes: U4-6363 Expose Dictionary item access on UmbracoHelper
2015-05-18 13:38:14 +10:00
Umbraco.MSBuild.Tasks
…
umbraco.providers
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
Umbraco.Tests
Merge branch '7.3.0' into dev-v7-contenttypeeditor
2015-06-08 18:03:39 +02:00
Umbraco.Web
Merge branch '7.3.0' into dev-v7-contenttypeeditor
2015-06-08 18:03:39 +02:00
Umbraco.Web.UI
Merge branch '7.3.0' into dev-v7-contenttypeeditor
2015-06-08 18:03:39 +02:00
Umbraco.Web.UI.Client
Merge branch '7.3.0' into dev-v7-contenttypeeditor
2015-06-08 18:03:39 +02:00
UmbracoExamine
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
WebPi
…
SolutionInfo.cs
Bump version
2015-06-03 14:03:04 +02:00
Umbraco.MSBuild.Tasks.sln
…
umbraco.presentation.targets
…
umbraco.sln
oops, not sure how the LICENSE got deleted, removed AD identity nuspec since that is in a diff repo now. Removes commented out code in umb module for auth - this is done by cookie middleware now.
2015-04-01 13:55:33 +11:00
umbraco.sln.DotSettings
…
umbraco.vssscc
…