Commit Graph

11 Commits

Author SHA1 Message Date
Sebastien Ros
0e47295b9f Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
2015-06-19 11:33:12 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files.
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
2015-05-02 10:14:29 +02:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Piotr Szmyd
7cb97fdd7c Revert "Fixing build warnings. Added binding redirects for JSON.NET 6.0"
It's a tooling issue, not Orchard - warnings are caused by Azure VS Tools 2.3 (http://connect.microsoft.com/VisualStudio/feedback/details/850425/windows-azure-vs-tools-breaking-msbuild-for-web-projects)
2014-07-15 21:57:59 +02:00
Piotr Szmyd
eb38abcc31 Fixing build warnings. Added binding redirects for JSON.NET 6.0 2014-07-15 14:23:43 +02:00
Daniel Stolt
6c5c8d2ab8 Synchronized Web.config namespace imports between Orchard.Web and Orchard.Azure.Web. Added missing view-level using statement in Orchard.Azure.MediaServices. 2014-03-25 11:24:34 +01:00
Daniel Stolt
871e5c9021 Moved some dependencies to the root "lib" folder and updated Web.config in Orchard.Web and Orchard.Azure.Web. 2014-03-22 17:21:16 +01:00
Daniel Stolt
bddaa8cc60 Added the Orchard.Azure.MediaServices module. 2014-03-22 15:59:41 +01:00