lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,239 Commits 73 Branches 31 Tags 239 MiB
e92c1f6356
Commit Graph

219 Commits

Author SHA1 Message Date
Lombiq
d173816619 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
	src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js
	src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css
	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
	src/Orchard/Commands/CommandBackgroundService.cs.rej
 2015-12-03 00:07:28 +01:00
Lombiq
15d27043d7 Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:00:36 +01:00
Sipke Schoorstra
bcf4813c3e Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
 2015-11-03 22:44:13 +01:00
Sebastien Ros
0d5cff66a9 Fixing Azure Portal integration 2015-10-21 14:41:41 -07:00
Sebastien Ros
07c539e749 Merge remote-tracking branch 'origin/dev' into dev 2015-10-15 15:08:45 -07:00
Sebastien Ros
f1cd6aa38d Merge branch '1.9.x' into dev 
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
 2015-10-15 15:07:19 -07:00
dcinzona
855d183be3 Fixes #5935 Updates Azure.Storage to 5.0.2.0 2015-10-13 15:38:57 -04:00
CSurieux
330f637473 upgrade the WebApi dlls in lib to Microsoft HTTP Client Libraries 2.2.29 (package) 2015-10-11 14:31:28 +02:00
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
 2015-09-30 15:57:34 -07:00
Sebastien Ros
62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Daniel Stolt
7d4ed4416d Updated to latest version of MSBuild community tasks. 
This makes it possible to execute Orchard.proj to build and package on a build server that doesn't have .NET Framework 3.5 installed.
 2015-09-30 19:29:12 +02:00
Sebastien Ros
248cc7ecde Updating webpi package files 2015-09-21 15:29:31 -07:00
Daniel Stolt
a8db54d994 Added missing PDF file. 2015-08-25 16:24:29 +02:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
Sipke Schoorstra
f3a7aeffcb Merge branch '1.9.x' into dev 2015-07-23 11:44:57 +01:00
Sebastien Ros
0fc8f5accf Updating Redis driver 2015-07-21 18:08:10 -07:00
Sebastien Ros
d6c452466c Merge branch '1.9.x' into dev 2015-06-19 12:57:49 -07:00
Sebastien Ros
51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
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
Sébastien Ros
d2ad3e31bb Merge pull request #5358 from oldrev/feature/postgresql 
Feature: PostgreSQL Support
 2015-06-18 12:35:03 -07:00
Daniel Stolt
d3ccd743e9 Added a missing MVC dependency assembly. 
For people with MVC 4 installed on their local box, this DLL was in the GAC so this was not an issue. However, with only VS2015 installed and no pre-nuget version of MVC, this causes a YSOD.
 2015-06-09 00:24:19 +03:00
oldrev
fb717b0e2e Add PostgreSQL RDBMS support 2015-06-07 09:39:49 +08:00
Bertrand Le Roy
39b4009e40 Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js 2015-03-20 20:14:37 -07:00
Daniel Stolt
2515f943f6 Moved xmldiffpatch dependency to root lib folder. 2015-02-11 23:55:54 +01:00
Sipke Schoorstra
cdd1961a8a Updated to Microsoft Azure SDK 2.5. 2015-01-16 00:06:27 +01:00
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