Shannon
95ff94c532
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/packages.config
2015-05-11 12:26:53 +10:00
Shannon
a4a49b1466
Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC.
2015-05-11 11:45:13 +10:00
Shannon
3be1cd8b0d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
Shannon
1cac4ed075
Fixes MVC 4.0.0.1 problem once and for all.
2015-05-07 08:10:45 +10:00
Shannon
ff602da0fa
Updates owin packages and updates the web.config tempate for owin redirects
2015-04-01 13:41:45 +11:00
Shannon
a2a8c8fbd7
updated to latest owin
2015-04-01 13:41:36 +11:00
Sebastiaan Janssen
a1c223bc2b
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
...
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
2014-11-26 10:43:46 +01:00
Sebastiaan Janssen
f4231b1692
Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it)
2014-10-17 17:24:32 +02:00
Shannon
0da4879400
downgrades mini profiler to what it used to be
2014-06-09 15:32:44 +02:00
Shannon
df3bc873df
Upgrades mini profiler and enables it in the back offfice.
2014-05-30 15:26:22 +10:00
