lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,328 Commits 83 Branches 32 Tags
7fa4783b1d732f634a19a91544d3d08b9f3e2aea
Commit Graph

5635 Commits

Author SHA1 Message Date
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
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
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
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
c0cc167a87 Merge branch '1.9.x' into dev 2015-11-25 15:44:26 +01:00
Sipke Schoorstra
f7ba32a0c2 Merge pull request #6054 from OrchardCMS/feature/configurable-snippets 
Added support for configurable snippet elements.
 2015-11-24 23:20:01 +01:00
Sipke Schoorstra
37550593d4 Added support for reusing the same field in a single snippet file. 2015-11-24 23:19:06 +01:00
Lombiq
b9091a7889 Removing unnecessary if when creating shape alternates 2015-11-24 21:00:34 +01:00
Lombiq
53317d97c5 Revert "Fixing that TinyMCE is encoding special chars" 
This reverts commit 188fabe233.
 2015-11-24 20:54:41 +01:00
Daniel Stolt
cee6539430 Fixed the things that someone always forgets. ;) 
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
 2015-11-24 19:35:27 +01:00
Daniel Stolt
b6dc75d4f9 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
 2015-11-24 19:20:05 +01:00
Lombiq
1c4c64b812 Fixing that widgets with name containing dash can't have named alternates #3379 2015-11-24 17:17:12 +01:00
Lombiq
c5fb96ca4f Fixing that Workflows activities are not measured in relative coordinates 2015-11-24 14:23:20 +01:00
Lombiq
188fabe233 Fixing that TinyMCE is encoding special chars 2015-11-24 14:13:41 +01:00
Sipke Schoorstra
7b47356152 Merge pull request #6062 from OrchardCMS/feature/resources 
Orchard.Resources - Consolidate third-party client-side resources into dedicated module
 2015-11-24 01:45:40 +01:00
Sipke Schoorstra
a09c2045c5 Consolidated separate features into a single one. 2015-11-24 01:44:49 +01:00
Marek Dzikiewicz
715d557f32 Fix handling braces in tokens 
This brings Tokenizer changes from changeset
423fec90b3
 2015-11-22 18:34:27 +01:00
Sipke Schoorstra
3da3ab8a49 Added Uri. 2015-11-21 15:49:23 +01:00
Sipke Schoorstra
1271539b0a Added BlockUI and Moment. 2015-11-21 15:42:03 +01:00
Sipke Schoorstra
599624c3b0 Added History and Knockout and updated MediaLibrary. 2015-11-21 15:09:56 +01:00
Sipke Schoorstra
ddddb7407f Added Bootstrap and FontAwesome. 2015-11-21 14:21:29 +01:00
flew2bits
cbcffb52d0 Fixed braces 2015-11-20 15:35:52 -05:00
flew2bits
0da9370296 Added signal to invalidate media profile cache when newly published. 2015-11-20 15:20:03 -05:00
mkinawy
4db088fb9c fixes #5978 by moving the select button to the top of the media picker window and hides the save button untill some image is selected 2015-11-20 21:08:10 +02:00
Sipke Schoorstra
8258bb3589 Moved AngularJS and Underscore to Resources. 2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81 Created initial version of Orchard.Resources module. 
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
 2015-11-20 00:21:39 +01:00
Marek Dzikiewicz
b3bf80395a Fix TextTokens - Format and TrimEnd 
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
 2015-11-19 23:01:50 +01:00
Sébastien Ros
0e627f8810 Renaming css selector for comment id 2015-11-19 12:36:38 -08:00
Sébastien Ros
d64bb02783 Merge pull request #6015 from ryandrewburnett/dev 
Fixed reply button and comment link and added useful CSS class.
 2015-11-19 12:35:21 -08:00
Sébastien Ros
2f9a2c0c38 Merge pull request #6041 from sunz7/issue/6000 
[Fixes 6000] Fixed typo in IndexingCommands.cs
 2015-11-19 12:26:20 -08:00