lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 09:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
11,242 Commits 93 Branches 33 Tags
3649844b663a0152a2ee5a0b0c6f517e0aaf8710
Commit Graph

55 Commits

Author SHA1 Message Date
Jay Harris
3649844b66 Update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest (#8087) 2018-08-09 12:22:42 -07:00
Lombiq
5a6b56cc72 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config
 2017-12-22 21:05:17 +01:00
Benedek Farkas
ed0c60c5fd 5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892) 2017-12-21 12:49:53 -08:00
Benedek Farkas
7599a25594 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj
 2017-11-10 00:54:02 +01:00
Benedek Farkas
2904d35d91 Enabling C# 6 for Dynamic Compilation and Razor IntelliSense 
Fixes #5408
 2017-11-09 12:04:12 -08:00
Benedek Farkas
cdcec3cd8b #7713: View compilation with MSBuild (#7732) 
Fixes #7713
 2017-06-29 21:10:51 +02:00
Sebastien Ros
eee341696d Merge branch '1.10.2' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
#	src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
#	src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
 2017-04-03 11:54:43 -07:00
Benedek Farkas
185ad6b1eb Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641) 
Fixes #7639
 2017-04-03 10:38:41 -07:00
Lombiq
a6f46d17cd Fixing references to NuGet package dlls (Orchard.Azure, Orchard.Azure.Tests, Orchard.Framework) 2016-03-26 16:16:32 +01:00
Daniel Stolt
c6c667d180 Removed Azure cloud service support. 
Removed cloud service things from build and deployment scripts.
Removed Orchard.Azure.sln.
Removed Orchard.Azure.CloudService and Orchard.Azure.Web projects.
Removed Azure Diagnostics support.
Removed cloud service machine name provider.
Removed Azure Cache support.
Updated Orchard.Azure.Tests and moved into main solution.
Removed Orchard.Azure.Tests.sln.
 2016-03-25 17:20:51 +01:00
Sebastien Ros
e510ec2998 Removing unknown binaries 2016-01-13 17:58:11 -08:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Rob King
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
Rob King
75161221ee Moved WindowsAzure.ServiceRuntime to Orchard NuGet Feed 2015-12-22 11:37:14 +00:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
0d946b7553 Moved Azure to NuGet. Version change: None 2015-12-08 14:45:14 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Rob King
86fd4a0df5 Moved NHibernate to NuGet. Version change: None 2015-12-04 18:06:08 +00:00
Rob King
fe215587b1 Moved Newtonsoft.Json to NuGet. Version change: None 2015-12-04 17:32:50 +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
Lombiq
680a9eb85b Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:10:12 +01:00
Sipke Schoorstra
8d0205ebfb Changed namespace. 2015-09-17 21:51:58 +01:00
Sipke Schoorstra
c6a87f5228 Refactor renamed IMachineNameProvider. 2015-09-15 22:58:21 +01:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
cdd1961a8a Updated to Microsoft Azure SDK 2.5. 2015-01-16 00:06:27 +01:00
Daniel Stolt
4a18247588 Moved IMachineNameProvider into Orchard.Framework. 2014-11-17 02:30:25 +01:00
Sebastien Ros
d0c7091964 Adding Orchard.Redis module 2014-09-30 16:25:49 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
4a481ed5ab Adding experimental support for Redis output cache 2014-05-12 15:27:58 -07:00
Sebastien Ros
30aeb54fd3 #20213: Implementing retry logic 
Work Item: 20213
 2014-04-17 15:20:09 -07:00
Daniel Stolt
c58e82ebd1 Refactored platform configuration code in Orchard.Azure. 2014-03-26 00:03:10 +01:00
Lombiq
4f4f1c870b Partially reverting the changes made related to #20337 to fix the errors caused by the limitations by NHibernate. 2014-03-25 21:25:46 +01:00
Lombiq
438483e502 #20527: Extending DefaultPlatformConfigurationAccessor to check for setting in ConnectionStrings and AppSettings 
Work Item: 20527
 2014-03-07 02:40:37 +01:00
Lombiq
852d08a3f1 #20337: Re-implementing PlatformConfiguration as an injectable dependency (Orchard.Azure) 
Work Item: 20337
 2014-03-07 02:03:40 +01:00
Sebastien Ros
53a0f91747 Adding missing reference in Orchard.Azure 2014-02-24 10:45:24 -08:00
Sebastien Ros
18118b44ee Support Azure media urls containing special chars 2014-02-24 10:45:13 -08:00
Sebastien Ros
de4a12defa Merge branch '1.7.x' into 1.x 2014-02-03 16:32:08 -08:00
Daniel Stolt
ece9cff117 #20433: Added specialized implementation of IMachineNameProvider that uses the role instance ID instead of the Windows machine name for task lease records, and activated this implementation for cloud services through Host.config. This makes task lease records resilient to role instance reimaging. 
Work Item: 20433
 2014-01-22 21:27:16 +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
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
csadnt
c7a524536a Bad 'Content' directives for assemblyInfo.cs files in these modules 2013-10-07 16:58:52 -07:00
Sebastien Ros
d1d51e6f92 Fixing Azure features 2013-09-06 13:44:27 -07:00
Sebastien Ros
218db5af09 Fixing webdeploy support 2013-09-04 18:41:11 -07: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
Sebastien Ros
bde2006dc7 Code cleanup 2013-08-30 12:50:39 -07:00
Daniel Stolt
db85911c2f Modified all providers in Orchard.Azure to read their settings from platform configuration. 
Added clear exceptions in provider constructors when settings are missing or invalid.
Refactored cache client configuration and creation into separate class.
 2013-08-30 12:14:06 -07:00
Daniel Stolt
4f354898b9 Committed missing file to repo. 2013-08-30 12:14:05 -07:00
Daniel Stolt
9c61a70e41 Reverted platform configuration override change. 2013-08-30 12:13:53 -07:00