lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 12:03:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,213 Commits 84 Branches 32 Tags
1.10.4
Commit Graph

243 Commits

Author SHA1 Message Date
Zoltán Lehóczky
4845e2dc4b Merge remote-tracking branch 'origin/1.x' into feature/owin 2014-12-24 19:52:43 +01:00
Sipke Schoorstra
3fdbd218d0 #20918: Updating Azure libraries. 2014-12-01 21:49:52 -08:00
Lombiq
cca9ecc693 Updating Microsoft.Owin and Microsoft.Owin.Host.SystemWeb to latest (v3.0) 2014-10-27 17:12:31 +01:00
Lombiq
dc772cf893 Merge remote-tracking branch 'origin/1.x' into feature/owin 
Conflicts:
	src/Orchard.Web/Web.config
	src/Orchard/Orchard.Framework.csproj
 2014-10-27 17:01:00 +01:00
Nicholas Mayne
4b4f673c36 #19816: Removing markdownsharp reference and adding code class instead. 
Work Item: 19816
 2014-10-13 21:32:48 +01:00
Nicholas Mayne
020f6faa45 Updating castle to Castle.Core 3.3.1 2014-10-12 22:54:54 +01:00
Nicholas Mayne
4a5edec463 Updating ImageResizer to 3.4.3 2014-10-12 22:42:05 +01:00
Nicholas Mayne
5422a95921 Updating Newtonsoft JSON to 6.0.5 2014-10-12 16:42:16 +01:00
Nicholas Mayne
1bab01738b Updateing NHibernate to 4.0.1.4000 and Syscache to 4.0.0.4000 2014-10-12 16:37:26 +01:00
Nicholas Mayne
f99e1a9c2b Merge branch 'feature/localizationchanges' into 1.x 2014-10-12 13:48:54 +01:00
Stanley Goldman
2ca1f857ff Removing outdated nHibernate patch information 2014-10-09 20:34:16 -04:00
Nicholas Mayne
b2bd25f1af Merge 1.x 2014-09-23 13:21:31 +01:00
Sebastien Ros
f2a7bc59da #20737: Removing ReliableSqlConnection as we moved to 4.5.1 
c.f. http://tudorturcu.wordpress.com/2013/11/11/ado-net-connection-resiliency/

Work Item: 20737
 2014-09-11 17:29:25 -07:00
Nicholas Mayne
c7c9f8e233 Merge branch '1.x' into feature/localizationchanges 2014-08-27 21:43:11 +01:00
Nicholas Mayne
cf02023a2a Adding Transliteration Lib 2014-08-25 12:06:40 +01:00
Sebastien Ros
0295764234 Updating NHibernate 4.0 
Using a local updated build of FluentNHibernate (still 1.4.0)
 2014-08-22 16:10:55 -07:00
Sebastien Ros
87bbc4d591 Removing Microsoft.WindowsFabric assemblies 2014-08-15 14:34:17 -07:00
Sebastien Ros
c816d8e24f Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
 2014-08-15 13:52:08 -07:00
Sebastien Ros
9550146acc Fixing build warnings 2014-08-15 13:42:52 -07:00
Sebastien Ros
8787b7cd5c Fixing build due to library upgrades 2014-08-15 10:57:17 -07:00
Sebastien Ros
86ed2fde82 Upgrading to SqlCe 4.0 SP1 2014-08-13 15:57:09 -07:00
Sebastien Ros
fe0c1a8a03 Upgrading to Autofac 3.5.2 2014-08-13 15:42:43 -07:00
Sebastien Ros
b7a3c1e77a Upgrading to Json.NET 6.0.4 2014-08-13 12:59:30 -07:00
Sebastien Ros
0a8685bab3 Upgrading to ASP.NET MVC 5.2 2014-08-13 12:58:57 -07:00
Nicholas Mayne
52a04b3445 Removing legacy tinymce dupe 2014-08-12 20:38:03 +01:00
Lombiq
ce3c5daead #20862: Updating Log4Net to 1.2.13 
Work Item: 20862
 2014-08-09 13:33:35 +02:00
Sebastien Ros
5f29844ca3 Merge branch '1.x' into feature/owin 2014-08-08 14:33:14 -07:00
Sebastien Ros
d553bae487 Updating Redis libraries 2014-07-31 16:53:02 -07:00
Nicholas Mayne
633615eb5c Updating Owin assemlies, and fixing broken unit tests 2014-07-13 10:42:21 +01:00
Nicholas Mayne
4b0a0d21be Merge 1.x 2014-07-13 09:52:31 +01:00
Nicholas Mayne
4761ec4313 Updating Newtownsoft Json 2014-05-17 11:12:59 +01:00
Sebastien Ros
4a481ed5ab Adding experimental support for Redis output cache 2014-05-12 15:27:58 -07:00
Sebastien Ros
14674a9908 Fixing DynamicProxy unit tests by reverting autofac upgrade 2014-03-26 18:38:20 -07:00
Sebastien Ros
0fbc2e47bc Fixing unit tests and warnings 2014-03-26 17:37:01 -07: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
Piotr Szmyd
ce535797aa Updated ancient Castle libraries to version 3.2.0. Castle.DynamicProxy2 and Castle.MicroKernel are obsolete - have already been merged into Castle.Core. 2014-02-21 16:00:43 +01:00
Sipke Schoorstra
da7bbacba9 Revert "Updated Windows Azure Storage dll to latest version." 
This reverts commit dd52801aa9.
 2014-02-21 00:11:54 +01:00
Sipke Schoorstra
dd52801aa9 Updated Windows Azure Storage dll to latest version. 2014-02-16 21:35:15 +01:00
Sebastien Ros
77b551d24b Fixing compilation warnings 2014-02-04 11:58:27 -08:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Daniel Stolt
7df4f0abb6 Updating some Windows Azure dependencies to latest versions. 2013-12-09 19:53:53 +01:00
Sebastien Ros
01b6667d6d Updating System.Net.Http 2013-11-13 15:38:05 -08:00
Sebastien Ros
6783355f3e Upgrading Web Api libraries 2013-11-12 17:44:15 -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
Daniel Stolt
3e20412ef0 Updating to Windows Azure SDK 2.2. 2013-10-28 22:18:46 +01:00
Erik Oppedijk
7f9f3f47fc updated dll to mvc5 2013-10-24 22:01:00 +02:00
Sebastien Ros
d12c26aa90 Adding Owin support 
Some tests are broken right now
 2013-10-22 18:14:00 -07:00
Sebastien Ros
2f45a02a1f Patching the nhibernate build 2013-09-24 10:32:58 -07:00
Piotr Szmyd
5f52748341 #20132: Updated NHibernate to 3.3.3 SP1 
Work Item: 20132
 2013-09-22 17:43:59 +02:00
Sebastien Ros
5bea23dcd0 Adding missing assemblies for XDT transformation 2013-09-12 16:37:24 -07:00