lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,779 Commits 94 Branches 33 Tags
580b79c24db2da9b7d97039b4fd6db03412fb5c6
Commit Graph

71 Commits

Author SHA1 Message Date
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
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Erik Oppedijk
ef7318fa58 remove webpages:enabled from scripts and content folders 2013-12-04 11:55:57 -08:00
Erik Oppedijk
3061412961 Delete views/web.config and update webpages to 3.0 2013-12-04 11:55:54 -08:00
Erik Oppedijk
5805f0ad9b Repair intellisense, update references 2013-12-04 11:54:34 -08:00
Sebastien Ros
6c0b85ad74 Merge branch 'master' into 1.x 
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
 2013-11-11 18:11:53 -08:00
Sebastien Ros
7afb052e7c Updating version numbers 2013-11-08 16:53:03 -08:00
Sebastien Ros
f6f6a56c24 Merge branch 'feature/fw45' into 1.x 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config
 2013-10-11 16:40:44 -07:00
Sebastien Ros
f0851bb5fb Updating version numbers 2013-09-10 14:08:05 -07:00
Erik Oppedijk
26c45498df Remove unused assemblybinding redirect (mvc 2 to 3 redirect) from views folder 2013-08-27 22:07:42 +02:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Erik Oppedijk
65eb63d29d Update all MVC references to 4.0 and Razor to 2.0 2013-08-20 10:39:13 +02:00
Erik Oppedijk
b49b65636f remove IIS6 settings 2013-08-15 17:14:39 -07:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
4053c45d49 Including Orchard.TaskLease 
--HG--
branch : 1.x
 2012-08-22 15:37:53 -07:00