lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,377 Commits 94 Branches 33 Tags
225f765a00a5f66cd48e571d2c494511c006396f
Commit Graph
772 Commits
Author SHA1 Message Date
Daniel Stolt e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00
Sébastien Ros c75ba007e6 Merge pull request #5453 from kumards/patch-1 
Fix for duplicate version number on creating a new draft
 2015-07-02 12:28:36 -07:00
adeveloper aaef6d8810 Adding a test case for DraftRequired version option building new version of the content 2015-07-01 14:31:31 -04:00
Sebastien Ros 1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sebastien Ros 6b0985a44e Merge branch 'master' into 1.9.x 2015-06-30 11:31:35 -07:00
Sebastien Ros 760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Marek Dzikiewicz 6636527006 Add unit tests for #4154 and #5402 2015-06-23 11:44:46 +02: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
Sébastien Ros d2ad3e31bb Merge pull request #5358 from oldrev/feature/postgresql 
Feature: PostgreSQL Support
 2015-06-18 12:35:03 -07: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 76408da930 #5315: Adding new settings to configure SSL cookies 
- Creating ISslSettingsProvider to define whether cookies can only be sent over SSL or not
- Implementing DefaultSslSettingsProvider based on Sites.config and web.config
making it configurable per tenant or for the whole site
- Implementing SecureSocketsLayerSettingsProvider in Orchard.SecureSocketsLayerSettingsProvider

Fixes 5315
 2015-06-17 18:06:47 -07:00
Sebastien Ros 20c5b494cd By default, html-encode translation parameters 
Also ensure that any existing parameter is not double-encoded by
removing .Text when used as a translation parameter.
 2015-06-16 16:50:45 -07:00
Sipke Schoorstra e03df31e50 Fixed unit tests. 2015-06-09 01:23:06 +03:00
Sipke Schoorstra aba53e122d Cherry picked ce630f980c. 2015-06-09 01:22:41 +03:00
oldrev fb717b0e2e Add PostgreSQL RDBMS support 2015-06-07 09:39:49 +08:00
Sipke Schoorstra 56032dd815 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-07 00:46:14 +02:00
Sipke Schoorstra 071733495e Fixed unit tests. 2015-06-04 11:33:53 +02:00
Sipke Schoorstra ce630f980c #5305: Fixing the issue where httpcontext would be resolved from the wrong lifetime scope container in certain cases. 
This changeset fixes a number of issues:
- Fixes the Autofac.Core.DependencyResolutionException: A delegate registered to create instances of 'System.Web.HttpContextBase' returned null error in VS 2015.
- Fixes indexing of layout part. The issue was that elements being rendered from a background task context and an element template uses an HTML helper, that would cause an exception since HttpContext.Current would normally be null.
- Replaces the need for injecting HttpContextBase with injecting IHttpContextAccessor (actually one should never inject HttpContextBase anymore - use IHttpContextAccessor instead).
 2015-06-04 02:06:24 +02:00
qt1 6e94264df2 Provide full table name prefix for migrations 2015-06-01 02:07:42 +03:00
Daniel Stolt 635abd7456 Fixed unit tests not being discovered due to CopyLocal=false on core references. 
Having CopyLocal=false on references to Orchard.Core and Orchard.Framework in unit test projects prevented VS from discovering unit tests (at least when using the NUnit Test Adapter for Visual Studio). This change resets CopyLocal=true for these references in all unit test projects.
 2015-05-07 14:16:56 +02:00
Sebastien Ros 2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sebastien Ros d941ea1509 Fixing failing culture based test on CI 2015-04-29 15:15:20 -07: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
Kees Damen ee1b7a5088 Merge branch '1.x' of https://github.com/keesd/Orchard into 1.x 2015-04-16 16:29:42 +02:00
Kees Damen 2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra bcb6f2c4ac Merge branch '1.9-int' into 1.x 2015-04-16 16:10:57 +02:00
Sipke Schoorstra dad113feed #5116: Fixed failing tests. 2015-04-15 14:00:16 +02:00
Daniel Stolt fac9080326 Removed JetBrains attributes from code base and removed suppression of CS0436 compiler warning. 2015-03-21 15:38:35 +01:00
Sebastien Ros 5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Lombiq 651ad96047 Fixing DefaultOrchardHostTests 2015-02-12 00:12:10 +01:00
PaulDevenneyBede efc573992c added "usecdn" to sitesettings 2015-02-07 17:55:23 +00:00
Zoltán Lehóczky 4845e2dc4b Merge remote-tracking branch 'origin/1.x' into feature/owin 2014-12-24 19:52:43 +01:00
Bertrand Le Roy bd605810a8 Use string.Join instead of obscure and inefficient Aggregate pattern 
CultureCommand change actually fixes a benign bug in one of the commands (extra space at the end).
DisplayHelper is clarified by better typing of intermediate results.
 2014-12-03 16:31:57 -08:00
Daniel Dabrowski b1d97f3ad5 20592: Fixing named routes support 
Work Item:20592
 2014-11-13 13:08:04 -08: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
Sipke Schoorstra 1ee643d03a Adding test cases for Restore method. 2014-10-26 17:59:21 -07:00
Sebastien Ros b5f1b49723 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
 2014-10-23 20:53:47 -07:00
Bertrand Le Roy 1540f69a79 Partial identity matches can now be considered as full matches, fixing a bug where import files would create duplicate items if imported several times. 2014-10-17 13:16:34 -07:00
Sipke Schoorstra 60021d92f4 Adding test. 
This test asserts that a failing data migration throws an OrchardException.
This exception is then handled by the controller to render the proper error message.
 2014-10-13 18:15:06 -07:00
Nicholas Mayne 020f6faa45 Updating castle to Castle.Core 3.3.1 2014-10-12 22:54:54 +01:00
Nicholas Mayne f99e1a9c2b Merge branch 'feature/localizationchanges' into 1.x 2014-10-12 13:48:54 +01:00
Zoltán Lehóczky 872a1de928 Revert "#20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either." This actually causes "Instances cannot be resolved and nested lifetimes cannot be created from this LifetimeScope as it has already been disposed." errors. 
This reverts commits 411e3f9ddd and b21d637ba4.
 2014-10-08 15:22:56 +02:00
Lombiq b21d637ba4 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-08 13:43:47 +02:00
Lombiq 0440d866e2 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-03 13:39:52 +02:00
Nicholas Mayne a618ed7102 Fixes to localizationservice to get with of silly select.. 2014-09-23 22:57:25 +01:00
Bertrand Le Roy 6642d3323c Added Html.HtmlHelperFor helper 2014-09-10 17:08:33 -07:00
Sebastien Ros 1b18621e00 Revert "Removing DefaultContentManagerSession" 
This reverts commit 262c825c26.
 2014-08-27 18:29:11 -07:00