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

150 Commits

Author SHA1 Message Date
Baruch Nissenbaum
9c2ea80670 Merge branch 'IBN-Labs/additional-module-directories-squashed' into IBN-Labs/additional-module-directories-dev-5 
Conflicts:
	src/Orchard.Web/Web.config
 2015-10-28 17:59:25 +02:00
Baruch Nissenbaum
1584bf703b Additional Module and Theme directories (squashed commit) 2015-10-24 20:05:21 +03: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
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
1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
Sebastien Ros
ee149191b9 Formatting web.config 2015-09-04 15:53:39 -07:00
Sebastien Ros
becc4abf23 Fixing Visual Studio warnings on web.config files 2015-08-27 11:11:10 -07:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
Xeevis
f708a0f32e Added woff2 mimetype 2015-08-09 11:24:05 +02:00
Sipke Schoorstra
86b232aa52 Reformatted web.config and added some default mimetypes. 2015-08-06 21:04:12 +01:00
Gustavo Tandeciarz
b76306dfb3 Added mimeMaps to root web.config 
I'm not sure that this is something that we want to include globally, but I have had some issues with the following mime maps on Azure.
Specifically, SVG files getting returned as binary, breaking embeds in media library, editors and UI (front and admin).

This may also be directly related to storing media files in azure blob storage (and setting the mimetype when uploading files to blob storage)
 2015-07-06 08:14:08 -04:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Sebastien Ros
51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Daniel Stolt
12a95c0335 Fixed missing assembly binding redirects for Azure Storage. 2015-05-02 22:48:23 +02:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Daniel Stolt
8b1f00e31c Disabled ASP.NET OutputCacheModule in Web.config. 2015-04-10 22:35:47 +02:00
Sipke Schoorstra
cdd1961a8a Updated to Microsoft Azure SDK 2.5. 2015-01-16 00:06:27 +01:00
Lombiq
b0ba9e69e8 Removing duplicated lines from Web.config 2014-10-29 14:27:47 +01:00
Lombiq
dff7f54d90 Re-formatting Web.config after merge 2014-10-27 17:13:00 +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
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
fe0c1a8a03 Upgrading to Autofac 3.5.2 2014-08-13 15:42:43 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
0a8685bab3 Upgrading to ASP.NET MVC 5.2 2014-08-13 12:58:57 -07:00
Sebastien Ros
c933828e26 Fixing upgrade to owin 2014-08-08 16:44:01 -07:00
Sebastien Ros
5f29844ca3 Merge branch '1.x' into feature/owin 2014-08-08 14:33:14 -07:00
Sebastien Ros
13f91bb8c1 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Web.config
 2014-07-31 17:44:16 -07:00
Lombiq
cf99946d3f Orchard.Web: fixing referenced version number of Orchard.WarmupStarter.WarmupHttpModule 2014-07-26 19:10:58 +02: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
Sebastien Ros
295099c215 Merge branch '1.8.x' into 1.x 2014-05-26 12:08:12 -07:00
Sebastien Ros
d63be30390 Improving output cache 
The OutputCache HttpModule is necessary to enable kernel cache. However
the current usage won't impact memory usage as pages are not
stored in output cache unless Page.InitOutputCache is called in MVC.
c.f. https://aspnetwebstack.codeplex.com/SourceControl/latest#src/System.Web.Mvc/OutputCacheAttribute.cs
 2014-05-26 12:07:38 -07:00
Nicholas Mayne
4761ec4313 Updating Newtownsoft Json 2014-05-17 11:12:59 +01:00
Sebastien Ros
378f57601e Merge branch '1.8.x' into 1.x 2014-04-29 14:19:21 -07:00
Sebastien Ros
fd36b81f4b Disable ASP.NET output cache module 2014-04-29 14:18:44 -07:00
Sebastien Ros
dd203b3edf Fixing WarmupHttpModule version 2014-04-15 15:06:03 -07:00
Daniel Stolt
6c5c8d2ab8 Synchronized Web.config namespace imports between Orchard.Web and Orchard.Azure.Web. Added missing view-level using statement in Orchard.Azure.MediaServices. 2014-03-25 11:24:34 +01: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
Daniel Stolt
7f9628ba3d Uncommented section group in Web.config. 2014-03-04 16:57:17 -08:00
Daniel Stolt
2dea8ace03 Integrating jQuery Calendars and jQuery Calendars Datepicker to enable client-side support for non-gregorian calendars. Integrating jQuery Time Entry to replace jQuery UI TimePicker. Renaming IDateTimeLocalization to IDateTimeFormatProvider and providing two implementations (one using the localization process and one using the already localized strings made available by CultureInfo). Removed duplicated date time editor code from ArchiveLater, PublishLater, Fields and CommonPart, and replaced with new reusable DateTimeEditor editor template. 2014-03-04 16:57:16 -08:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Sebastien Ros
0890650d78 Fixing web.config classic mode configuration 
Modules' static files were no more working as they contain classic mode
configuration settings. This flag tolerates these settings.
 2013-12-10 15:17:40 -08:00
Sebastien Ros
92615984cf Reformatting web.config 2013-12-10 07:17:24 -08:00
Daniel Stolt
dd3a75b120 Added removal of 30 minute transaction timeout for debugging purposes to the release-mode Web.config transforms. Cleaned up the formatting of Web.config files. 2013-12-09 20:20:49 +01: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