lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,355 Commits 83 Branches 32 Tags
c59b761c3a1542e4edc0135724cb536e816b3132
Commit Graph

10355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob King
b04169f68b Moved npgsql to NuGet. Version change: None 2015-12-04 18:15: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
0163ce7fd3 Moved MySql to NuGet. Version change: 6.5.4.0 >>> 6.7.9.0 2015-12-04 17:18:17 +00:00
Sébastien Ros
9732c61b0f Merge pull request #6130 from musukvl/issue/6091 
[Fixes #6091] ImageProfileManager.GetImageProfileUrl can take multiple customFilters at a time.
 2015-12-04 09:10:54 -08:00
Rob King
7a4ae70d3e Fixed web.config affected by package updates 2015-12-04 16:49:25 +00:00
Rob King
21b9cc7d11 Moved Moq to NuGet. Version change: 4.0.812 >>> 4.0.10827 2015-12-04 16:46:21 +00:00
Rob King
8baf0a4039 Moved Lucene to NuGet. Version change: None 2015-12-04 16:39:04 +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
4d2f3c2916 Moved ImageResizer to NuGet. Version change: None 2015-12-04 16:13:35 +00:00
Rob King
39ac161c62 Moved HtmlAgilityPack to NuGet. Version change: 1.3.9.1 >>> 1.4.9.0 2015-12-04 16:05:38 +00:00
Rob King
c2c2577f20 Moved DotNetZip to NuGet. Version change: None 2015-12-04 13:55:09 +00:00
Rob King
fbf27540ea Moved IronRuby to NuGet. Version change: None 2015-12-04 12:45:37 +00:00
Rob King
9d20813f8f Moved Castle to NuGet. Version change: None 2015-12-04 12:32:41 +00:00
Rob King
9e57785e4a Fixed Orchard.Web.Tests project file references 2015-12-04 11:58:42 +00:00
Rob King
929b6bb2c0 Moved Autofac to NuGet. Version change: None 2015-12-04 11:36:33 +00:00
Rob King
6df007561d Moved NUnit to NuGet. Version change: 2.5.2.9222 >>> 2.5.10.11092 2015-12-04 11:27:42 +00:00
Sipke Schoorstra
d9e96d6870 Fixed Dynamic Forms merge issue. 
1.9 > dev: renamed ElementDisplayContext to ElementDisplayingContext.
 2015-12-04 12:26:42 +01:00
Sipke Schoorstra
18b2ffe593 Merge branch '1.9.x' into dev 
Conflicts:
	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/FieldsetElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs
 2015-12-04 12:20:58 +01:00
Sipke Schoorstra
68b3fe56d0 Updated various input elements using NoEncode. 
This prevents HTML characters from being encoded when using the tokenizer on element labels.
 2015-12-04 12:14:21 +01:00
Sipke Schoorstra
e29fb90298 Removed processing of tokens of RuntimeValue (Dynamic Forms). 
Also fixes #6117.

(cherry picked from commit db564d1670)
 2015-12-04 11:55:14 +01:00
Sipke Schoorstra
db564d1670 Removed processing of tokens of RuntimeValue (Dynamic Forms). 
Also fixes #6117.
 2015-12-04 00:18:27 +01:00
Sipke Schoorstra
f4f47322c0 Fixed a second binding issue with an overloaded method. 2015-12-03 23:59:18 +01:00
Sipke Schoorstra
8693b68ac7 Fixed a binding issue with FormsElementDriver. 
This fixes the issue where form elements whose drivers inherit from FormsElementDriver would not persist their changes.

Fixes #6100, #6035
 2015-12-03 22:47:29 +01:00
Lombiq
37bbafede6 Merge branch 'bug/handling-theme-dependencies' into dev 2015-12-03 21:43:34 +01:00
Sébastien Ros
7df47cfdc3 Merge pull request #6099 from jtkech/patch-3 
Invalidate image profile cache for images only
 2015-12-03 12:36:01 -08:00
Sébastien Ros
fd7feeafaa Merge pull request #6102 from Codinlab/fixes/4622 
[Fixes #4622] ShapeTracingFactory Should Not be Activable w/o HttpContext
 2015-12-03 12:34:06 -08:00
Sébastien Ros
143cc5e41d Merge pull request #6119 from mvarblow/patch-3 
Add missing user activity
 2015-12-03 12:08:09 -08:00
Sébastien Ros
bc820e6f9a Merge pull request #6124 from dcinzona/patch-3 
Removing duplicate fields from content parts fails
 2015-12-03 12:05:52 -08:00
Gustavo Tandeciarz
66e08e5f41 Removing duplicate fields from content parts fails 
SingleOrDefault will throw an error when removing fields with the same name.  Should be FirstOrDefault as it is on line 64
 2015-12-03 14:23:37 -05:00
Lombiq
680a9eb85b Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:10:12 +01:00
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
33484ae31a Fixed date and time picker. 2015-12-02 23:27:46 +01:00
mvarblow
e1019b5fac Update UserActivity.cs 
Add missing activity, fixes #5684 in 1.9.x branch.
 2015-12-02 11:34:47 -05:00
Sipke Schoorstra
c4f961105d Updated Orchard.Resources descr. by Daniel Stolt. 2015-12-01 22:54:06 +01:00
Lombiq
4901b156f5 Adding PowerShell script to clean the solution folder, fixes #2810 2015-12-01 00:59:14 +01:00
Lombiq
0e1cca0fce Improving how dependencies for themes are handled: enabling dependencies (modules) for themes too, handling this also when themes are just previewed and disabling themes when their dependencies are disabled. 
Fixes the tightly connected following issues: #4336, #5004, #4667
 2015-11-30 23:37:59 +01:00
Lombiq
408534c915 Merge branch '1.9.x' into dev 2015-11-30 22:58:33 +01:00
Lombiq
c2dd09af5e Fixing that NavigationQueryMenuItems and BlogArchives widgets couldn't be export/imported due to the lack of an identity, fixes #3488. 
Since the Projections migrations is already kind of a mess
 2015-11-30 22:50:19 +01:00
Sipke Schoorstra
dd59d7c385 Merge pull request #6104 from Codinlab/fixes/6033 
Fixes #6033 : EmailActivity fails when run via background task
 2015-11-29 19:10:49 +01:00
Thierry Fleury
5b53671a2a Revert "Removing unnecessary resolution" 
This reverts commit 9b91b1b260.
 2015-11-29 18:03:58 +01:00
Thierry Fleury
044bb2fdaf Fixes #4622 : ShapeTracingFactory Should Not be Activable without HttpContext 2015-11-29 16:24:02 +01:00
jtkech
9296358cbe Update ImageProfilePartHandler.cs 2015-11-29 02:20:36 +01:00
Alexey Ryazhskikh
c46c4dba24 #6091: ImageProfileManager.GetImageProfileUrl can take multiple customFilters at a time. 2015-11-27 20:24:36 +03:00
Benedek Farkas
fa0c93724e Merge pull request #6084 from OrchardCMS/1.9.x 
Adding dynamic Content property to the Content Item class
 2015-11-26 22:15:34 +01:00
Lombiq
af76305088 Adding dynamic Content property to the Content Item class for easily accessing Parts and Fields. Thanks Sébastien! :) 2015-11-26 22:11:40 +01:00
Sipke Schoorstra
7b6f0ec56f Merge pull request #6076 from PaulDevenney/Issues/6075/SetupSlowRecipes 
Added two optimisations to avoid duplicate work
 2015-11-26 17:15:40 +01:00
PaulDevenney
351e558fcd Added two optimisations to avoid duplicate work 
Avoids many retrievals of ShellStateRecord and stops enabling the same
feature multiple times. This can significantly improve recipe execution
time for those recipes with large numbers of features with long
dependency chains.
 2015-11-25 17:41:03 +00:00
Benedek Farkas
c0cc167a87 Merge branch '1.9.x' into dev 2015-11-25 15:44:26 +01:00