lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-08-01 17:51:18 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,236 Commits 73 Branches 31 Tags 239 MiB
4ca2379ffb
Commit Graph

10236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
4ca2379ffb Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Mvc/Routes/RouteExtensions.cs
	src/Orchard/Mvc/ViewEngines/IViewEngineProvider.cs
	src/Orchard/Mvc/ViewEngines/Razor/RazorViewEngineProvider.cs
	src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
	src/Orchard/Mvc/ViewEngines/ThemeAwareness/ThemeAwareViewEngine.cs
	src/Orchard/Mvc/ViewPage.cs
	src/Orchard/Mvc/ViewUserControl.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Recipes/Models/Recipe.cs
	src/Orchard/Recipes/Models/RecipeJournal.cs
	src/Orchard/Recipes/Models/RecipeStep.cs
	src/Orchard/Recipes/Services/IRecipeHarvester.cs
	src/Orchard/Recipes/Services/IRecipeJournal.cs
	src/Orchard/Recipes/Services/IRecipeParser.cs
	src/Orchard/Security/IMembershipService.cs
	src/Orchard/Security/Providers/FormsAuthenticationService.cs
	src/Orchard/Security/SecurityFilter.cs
	src/Orchard/Tasks/BackgroundService.cs
	src/Orchard/UI/Notify/NotifyFilter.cs
	src/Orchard/UI/Resources/MetaEntry.cs
	src/Orchard/Utility/Extensions/StringExtensions.cs
	src/Orchard/Validation/Argument.cs
	src/Orchard/Validation/JetBrains.Annotations.cs
	src/Orchard/WebApi/DefaultOrchardWebApiHttpHttpControllerActivator.cs
	src/Orchard/WorkContext.cs
	src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
 2015-12-09 00:38:35 +01:00
Lombiq
4105f4490b Normalizing line endings in some more files (most possibly remainder of the hg to git conversion) 2015-12-09 00:34:05 +01:00
Lombiq
2ab0094f73 Adding .gitattributes file to enforce common line ending configuration 
As also advised by GitHub: https://help.github.com/articles/dealing-with-line-endings/
 2015-12-09 00:25:49 +01:00
Sipke Schoorstra
3a7091467b Fixed duplicate field shape issue with Content Field elements. 
Fixes #5974
 2015-12-08 01:15:41 +01: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
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
Lombiq
ab12ff6a05 Adding notes about Orchard 2 to the README 2015-11-25 15:43:37 +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
Daniel Stolt
eb81c20f04 Set UseGlobalApplicationHostFile=True in Orchard.Web.csproj. 
This prevents VS2015 from creating a local applicationHost.config file in the solution, which in our case is excluded from source control anyway and therefore isn't used as intended.
 2015-11-24 19:14:31 +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