lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-31 21:15:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,420 Commits 73 Branches 31 Tags 239 MiB
aa9b2acbca
Commit Graph

10420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob King
0d946b7553 Moved Azure to NuGet. Version change: None 2015-12-08 14:45:14 +00:00
Sipke Schoorstra
3a7091467b Fixed duplicate field shape issue with Content Field elements. 
Fixes #5974
 2015-12-08 01:15:41 +01:00
Rob King
24eab4475f Reverted NHibernate.Linq to lib folder custom assembly 2015-12-07 20:49:36 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Connor Smallman
43d8b1a803 Wait for document ready before calling LayoutEditor constructor 2015-12-07 15:16:20 +00:00
jtkech
a33471183f Update MvcModule.cs 2015-12-06 05:18:48 +01:00
Rob King
ff7c7148ac Moved WebApi to NuGet. Version change: None 2015-12-06 00:13:39 +00:00
Rob King
6e73d46b39 Moved XMLDiffPatch to NuGet. Version change: None 2015-12-05 23:34:13 +00:00
Rob King
9284cc4986 Moved System.Spatial to NuGet. Version change: None 2015-12-04 21:40:50 +00:00
Rob King
7956bc5565 Moved Specflow to NuGet. Version change: None 2015-12-04 21:32:33 +00:00
Rob King
faa2702310 Moved Redis to NuGet. Version change: None 2015-12-04 21:12:56 +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
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
neTp9c
b04d953f75 Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107 2015-12-01 02:32:05 +03:00