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,412 Commits 83 Branches 32 Tags
f47ce2a5f021233efbd42fd25d5265ba7dd9ae5f
Commit Graph

9785 Commits

Author SHA1 Message Date
jtkech
e72b8c4bed Update SweepGeneratorTests.cs 2015-12-11 01:40:35 +01:00
jtkech
e889288687 Update DefaultShellContextFactoryTests.cs 2015-12-11 01:39:35 +01:00
jtkech
095a22eb6e Update DefaultWorkContextAccessorTests.cs 2015-12-11 01:37:58 +01:00
jtkech
d34eba4b99 Update HttpContextAccessor.cs 2015-12-11 01:33:19 +01:00
jtkech
a7b4d8c6ca Update WorkContextAccessor.cs 2015-12-11 01:31:00 +01:00
Sipke Schoorstra
1e963d4d50 Merge pull request #6159 from connorsmallman/Bug/6142/LayoutEditorJS 
Wait for document ready before calling LayoutEditor constructor
 2015-12-10 14:34:49 +01:00
Sipke Schoorstra
206f1396d5 Merge pull request #6144 from connorsmallman/Bug/6142/LayoutEditorJS 
Fix for issue #6142
 2015-12-10 14:28:59 +01:00
Rob King
b82d67a363 Merge branch 'dev' of https://github.com/gcsuk/Orchard into use-nuget-instead-of-lib-folder 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-12-09 09:04:24 +00:00
Lombiq
6cc481e825 Normalizing some more line endings 2015-12-09 00:41:46 +01:00
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
jtkech
9593155cb6 Update HttpContextAccessor.cs 2015-12-08 20:56:20 +01:00
jtkech
f3b3e0a7fb Update WorkContextAccessor.cs 2015-12-08 20:54:53 +01:00
Rob King
181ddd58b2 Merge branch 'dev' of https://github.com/gcsuk/Orchard into use-nuget-instead-of-lib-folder 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
 2015-12-08 15:24:38 +00:00
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