lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,281 Commits 83 Branches 32 Tags
74adc571aa136b1dbfdfbb73af816451ec3a19ef
Commit Graph

322 Commits

Author SHA1 Message Date
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Rob King
5c338e2dc5 Moved Owin to NuGet. Version change: None 2015-12-04 21:06:05 +00:00
Rob King
b04169f68b Moved npgsql to NuGet. Version change: None 2015-12-04 18:15:05 +00:00
Rob King
fe215587b1 Moved Newtonsoft.Json to NuGet. Version change: None 2015-12-04 17:32:50 +00:00
Rob King
0163ce7fd3 Moved MySql to NuGet. Version change: 6.5.4.0 >>> 6.7.9.0 2015-12-04 17:18:17 +00:00
Rob King
ae5cb595ef Moved Log4Net to NuGet. Version change: None - Package 2.0.3 contains DLL version 1.2.13 2015-12-04 16:33:23 +00:00
Rob King
929b6bb2c0 Moved Autofac to NuGet. Version change: None 2015-12-04 11:36:33 +00:00
Daniel Stolt
b6dc75d4f9 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
 2015-11-24 19:20:05 +01:00
Daniel Stolt
eb81c20f04 Set UseGlobalApplicationHostFile=True in Orchard.Web.csproj. 
This prevents VS2015 from creating a local applicationHost.config file in the solution, which in our case is excluded from source control anyway and therefore isn't used as intended.
 2015-11-24 19:14:31 +01:00
Daniel Stolt
b5d4cf01b5 Moved CopySqlCeBinaries earlier in the build process of Orchard.Web.csproj. 
This fixes an issue where, if Orchard.Web has not previously been built, the SQL CE binaries will not be included when doing a Web Deploy publish of Orchard.Web.
 2015-09-30 20:59:32 +02:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
Daniel Stolt
5d40be8390 Removing an MSBuild property that was not supposed to be committed. 2015-06-09 21:31:27 +03: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
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00
Lombiq
94cdaa3d74 Git files are now also excluded from publish 2015-01-10 19:56:55 +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
Stanley Goldman
4f4ad4d48f Revert "TagCloud Functionality to filter by User" 
This reverts commit ff1e1bf25a.
 2014-10-23 13:01:12 -04:00
Stanley Goldman
ff1e1bf25a TagCloud Functionality to filter by User 2014-10-22 20:27:40 -04:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
5f29844ca3 Merge branch '1.x' into feature/owin 2014-08-08 14:33:14 -07:00
Daniel Stolt
f9bd4f7c75 Removed incorrectly merged publishing profile. 2014-07-30 18:43:15 +02:00
Nicholas Mayne
633615eb5c Updating Owin assemlies, and fixing broken unit tests 2014-07-13 10:42:21 +01:00
Daniel Stolt
4ea58a1615 Updated publishing profile. 2014-07-06 19:35:51 +02:00
Daniel Stolt
f1276de0c2 Added missing project references and dependencies to Orchard.AuditTrail. Added a publishing profile. 2014-07-03 21:29:52 +02:00
Daniel Stolt
9fd6c88afd Incremental work. 2014-06-30 00:19:17 +02:00
Sipke Schoorstra
14a1eb0414 Adding Orchard.Messaging and Orchard.Templates 2014-01-08 18:38:42 -08:00
Sebastien Ros
6758b72938 Adding a way to configure the isolation level 2013-12-10 18:14:42 -08:00
Daniel Stolt
1aff8df92c Reverting IIS Express web site URL change. 2013-12-10 17:51:01 +01:00
Daniel Stolt
8870414d8c Correcting CopyLocal=true on Newtonsoft.Json reference in Orchard.Web. 2013-12-10 06:35:54 +01:00
Daniel Stolt
cfa4a5dfc2 Removing subfolder from Orchard.Web site URL in IIS Express (fixes configuration section YSOD issue). 2013-12-09 19:55:33 +01: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
91d0048f27 Fixing publishing of Orchard.Web in Debug build configuration. 2013-10-14 00:38:56 +02: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
b8ebd5124e Preparing the project to support SSL access 2013-09-25 17:36:21 -07:00
Sebastien Ros
d920b164e0 Implementing media search 2013-09-25 16:41:44 -07:00
Sebastien Ros
a0ea55a19a Excluding Themes\bin folder when publishing from visual studio 2013-09-09 15:09:14 -07:00
Sebastien Ros
887e02c38a Support all web deploy methods 2013-09-05 14:20:14 -07:00
Sebastien Ros
218db5af09 Fixing webdeploy support 2013-09-04 18:41:11 -07:00
Daniel Stolt
296154c294 Removed Azure assemblies from DLL exclusion list in Orchard.Web.csproj. 2013-09-04 22:28:29 +02:00
Daniel Stolt
c8e277ba11 Removed support for Shared Cache from Azure caching providers. 
Fixed bug in Azure output cache provider with tenant names containing non-alphanumeric characters.
Removed all Azure-related assembly references from Orchard.Web.csproj.
 2013-09-04 22:28:28 +02:00
Daniel Stolt
66a4e03378 Fixed an issue in the Orchard.Web.csproj project file that caused publishing to fail. 2013-09-03 10:54:25 -07:00
Daniel Stolt
e973c490d4 Added all Azure SDK assemblies to lib folder and referenced them from there. Removed redundant documentation comment. 2013-08-30 12:13:33 -07:00
Daniel Stolt
92f8d0df80 Added module Orchard.Azure. Added Azure Cache providers to it. 
Deleted old module Orchard.AzureBlobStorage.
Moved all Azure code into Orchard.Azure module, deleting the old Orchard.Azure project.
Cleaned up Web.config and Config\* files in Orchard.Web and Orchard.Azure.Web.
 2013-08-30 12:13:17 -07:00
Daniel Stolt
d4154fa1fe Cleaned up and fixed a couple of errors in Orchard.Web.csproj. 
Publishing now works for both Release and Debug configurations (previously worked only for Debug).
Added missing module project Orchard.AzureBlobStogare to Orchard.Azure.sln and added a reference to it from Orchard.Azure.Web.csproj.
Created separate solution folders Modules and Modules.Deprecated in Orchard.Azure.sln to be consistent with Orchard.sln.
Cleaned up web.config transformation files.
Upgraded Orchard.Azure, Orchard.Web and Orchard.Azure.Web to new storage client (version 2.0).
Removed duplication between Orchard.Azure and Orchard.AzureBlobStorage (the latter is now just a thin wrapper over the former).
Added proper transformations for log4net.config and HostComponents.config in both Orchard.Azure.Web and Orchard.Web (recreating what was previously done by custom MSBuild logic in the project files).
 2013-08-30 12:13:15 -07:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Sebastien Ros
8f1a0d343a Fixing duplicated cached content when using HttpModule with specific envent 
handlers

--HG--
branch : 1.x
 2013-07-09 17:17:44 -07:00
Sebastien Ros
79178ed480 #19736, 19671: Fixing deployment from Visual Studio and ignoring Tests folders 
Work Items: 19736, 19671

--HG--
branch : 1.x
 2013-05-22 15:43:58 -07:00
Sebastien Ros
3de95903dc #19717: Fixing default HostComponents.config values 
All file monitors are disabled, but ExtensionMonitoringCoordinator is kept to
detect new modules/themes.

Work Item: 19717

--HG--
branch : 1.x
 2013-05-21 15:22:15 -07:00