lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,357 Commits 94 Branches 33 Tags
1ce0166745fff74407daa8bc2938c05cd4e5af54
Commit Graph

11357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
1ce0166745 Merge branch '1.10.x' into dev 2019-05-21 16:32:04 +02:00
Lombiq
91dfb8880b Projections: Moving QueryVersionScopeOptions to the Models folder, code styling 2019-05-21 16:30:40 +02:00
Gábor Domonkos
12c0a029fd Removing IProjectionManagerExtension, fixes #7455 (#8206) 
Lombiq Technologies: ORCH-201
 2019-05-18 20:56:38 +02:00
Attila Álmos Szabó
2f96ccbd8a Textbox for specifying Default value to NumericField re-added, fixes #8124 (#8204) 
Lombiq Technologies: ORCH-194
 2019-05-18 20:46:53 +02:00
Gábor Domonkos
eababa3d13 Update Newtonsoft.Json to 12.0 everywhere, fixes #7213 (#8202) 
Lombiq Technologies: ORCH-205
 2019-05-18 20:19:29 +02:00
Hermes Sbicego
9955d92485 [8192] Fix permissions check for taxonomies, terms and widgets during translations (#8193) 2019-05-16 12:30:32 -07:00
Hermes Sbicego
d63068026a Null check in Localization.ContentTranslations.Edit.cshtml (#8197) 2019-05-16 12:29:21 -07:00
Matteo Piovanelli
e19d835e5a DefaultContentManager performance upgrade (#8207) 2019-05-16 12:15:44 -07:00
Márk Bartha
f66169cd29 Fixing that Orchard.Workflows requires styles that don't exist (#8201) 
Improves the changes from https://github.com/OrchardCMS/Orchard/pull/8009 by HengzheLi,
but allows loading Activity stylesheets from any extension (including custom paths), not just modules
 2019-05-15 23:26:52 +02:00
Márk Bartha
ecc089a7a6 DisplayManagement: Fixing that stylesheets that don't exist shouldn't create shapes (#8199) 2019-05-15 17:52:00 +02:00
Benedek Farkas
b64280174c Orchard.Specs: Fixing package references and assembly redirects (#7524) 2019-05-15 16:42:32 +02:00
Lombiq
cfb29c8335 Users: Fixing manual and automatic merge errors in AccountController, code styling 2019-05-14 15:03:13 +02:00
Lombiq
61d9b462a2 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
#	src/Orchard/UI/Resources/ResourceManager.cs
 2019-05-14 14:53:06 +02:00
GiuseppeMusso-Laser
7e174d9cfe Performance fix for autoroute check (#8186) 2019-05-10 12:38:14 -07:00
Hermes Sbicego
a542efbe8d [8194] Find translations for Localizaed Terms (#8195) 
Fixes #8194
 2019-05-10 12:13:58 -07:00
Niranjan Kala
f3f7c98e47 Issue/upgrade jquery (#8183) 2019-05-02 12:11:26 -07:00
Matteo Piovanelli
258a490536 fix NRE in DefaultHQLQuery (#8184) 
In the InSubquery method Criterion was not being set. This caused NRE when processing a WHERE predicate that used that method.
 2019-04-18 12:10:53 -07:00
Hermes Sbicego
c7f9cddb76 Fixes #8181: Prevent placement info loss (#8182) 
Fixes #8181
 2019-04-18 12:09:04 -07:00
cmsilv
2a047eaab3 Fix issue where unable to access files in App_data (#8180) 2019-04-18 12:07:26 -07:00
Lombiq
9beedf8b19 Projections: Fixing NRE in FieldTypeEditors when the Query doesn't have its VersionScope configured 2019-04-09 18:29:46 +02:00
Hermes Sbicego
a02323572d Style.Include and Script.Include register the wrong resource key in debug mode (#8177) 
Fixes #8176
 2019-04-04 12:11:03 -07:00
MarcoViglione-Laser
7b346f8a4d Custom Forms module enhanced with editing capabilities and improved permission handling (#8167) 2019-03-28 12:13:28 -07:00
Chaleomkiat Munkong
43f378769c Fix Tab id in Tab_Galley view (#8170) 2019-03-28 12:10:27 -07:00
Chris Payne
4d9a3ccaad Adds ability to configure field indexing options (#8173) 2019-03-28 12:05:54 -07:00
Lombiq
cb0011c307 Users: Fixing that registration-related actions should always be accessible (#8166) 1.10.3 2019-03-09 23:07:12 +01:00
Lombiq
ba722cf618 Users: Code styling and removing outdated comment from AccountController 2019-03-09 22:58:20 +01:00
Lombiq
c491990a0e Merge branch '1.10.x' into dev 2019-02-28 21:46:22 +01:00
GiuseppeMusso-Laser
a53d30dd6a Subquery improvement for HqlExpressions (#8163) 2019-02-28 12:21:49 -08:00
Lombiq
3c4de528c4 Orchard.proj: Fixing that BuildViews should be able to run without running Compile first 2019-02-28 17:46:45 +01:00
Lombiq
5c21b72793 Removing unnecessary step from BuildViews target (Orchard.proj) and removing debug build step from Orchard.Web.csproj 2019-02-27 21:12:07 +01:00
Lombiq
39894eb1fb Updating the CopyRoslynFilesToOutputFolder build target in Orchard.Web.csproj 
to make sure that the exact version used for Dynamic Compilation is found, even if there are multiple different versions restored
 2019-02-27 19:56:41 +01:00
Lombiq
8a44db7439 CodeGeneration: Updating website protocol to HTTPS in extension manifest templates 2019-02-27 15:45:27 +01:00
Lombiq
b912594699 CodeGeneration: Fixing that the csproj template was referencing DotNetCompilerPlatform in the wrong folder 2019-02-27 15:43:47 +01:00
Lombiq
38130f427b Updating Docs links in Readme to use HTTPS 2019-02-25 14:49:51 +01:00
Lombiq
82db009d70 Updating Microsoft.Data.* and System.Spatial packages to latest (5.8.4) version 2019-02-21 01:59:10 +01:00
Lombiq
48d24d7554 Merge branch '1.10.x' into dev 2019-02-21 01:39:48 +01:00
Lombiq
2ee16e1cb7 Orchard.proj: Fixing that Profiling-Setup should be able to start Orchard.exe with spaces in its path 2019-02-21 01:24:17 +01:00
Lombiq
f1bb89310c Orchard.Pages: Fixing that the "create page" shouldn't promote a page to home page unless it's also published 
This prevents SQL timeout and not having a home page content item
 2019-02-21 01:23:39 +01:00
Lombiq
c77f4f3cf1 Fixing Workflow Activity templates affected by a breaking change in OutcomeSerializerExtensions 
(cherry picked from commit 4b3c67dc5e)
 2019-02-20 23:38:41 +01:00
Lombiq
64c966af84 Untabifying test case files in Orchard.Specs and updating Profiling.feature.cs 2019-02-20 23:24:57 +01:00
Lombiq
4b3c67dc5e Fixing Workflow Activity templates affected by a breaking change in OutcomeSerializerExtensions 2019-02-20 21:29:27 +01:00
Lombiq
becb386adf Fixing merge errors and upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 2.0.1 where necessary 2019-02-20 21:18:30 +01:00
Lombiq
aced5c3e72 Merge branch '1.10.x' into dev 
# Conflicts:
#	README.md
#	src/Orchard.Specs/Boolean.feature
#	src/Orchard.Specs/Boolean.feature.cs
#	src/Orchard.Specs/DateTime.feature
#	src/Orchard.Specs/DateTime.feature.cs
#	src/Orchard.Specs/Enumeration.feature
#	src/Orchard.Specs/Enumeration.feature.cs
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Specs/Input.feature
#	src/Orchard.Specs/Link.feature
#	src/Orchard.Specs/Link.feature.cs
#	src/Orchard.Specs/Numeric.feature
#	src/Orchard.Specs/Numeric.feature.cs
#	src/Orchard.Specs/Text.feature
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Core/Web.config
#	src/Orchard.Web/Core/packages.config
#	src/Orchard.Web/Modules/Lucene/packages.config
#	src/Orchard.Web/Modules/Markdown/packages.config
#	src/Orchard.Web/Modules/Orchard.Alias/packages.config
#	src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Autoroute/packages.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
#	src/Orchard.Web/Modules/Orchard.Blogs/packages.config
#	src/Orchard.Web/Modules/Orchard.Comments/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
#	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/packages.config
#	src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/packages.config
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.Indexing/packages.config
#	src/Orchard.Web/Modules/Orchard.Layouts/packages.config
#	src/Orchard.Web/Modules/Orchard.Lists/packages.config
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/packages.config
#	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
#	src/Orchard.Web/Modules/Orchard.Media/Web.config
#	src/Orchard.Web/Modules/Orchard.Media/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config
#	src/Orchard.Web/Modules/Orchard.Modules/packages.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
#	src/Orchard.Web/Modules/Orchard.OutputCache/packages.config
#	src/Orchard.Web/Modules/Orchard.Packaging/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.PublishLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Recipes/packages.config
#	src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
#	src/Orchard.Web/Modules/Orchard.Resources/Web.config
#	src/Orchard.Web/Modules/Orchard.Resources/packages.config
#	src/Orchard.Web/Modules/Orchard.Roles/packages.config
#	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
#	src/Orchard.Web/Modules/Orchard.Rules/Web.config
#	src/Orchard.Web/Modules/Orchard.Rules/packages.config
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config
#	src/Orchard.Web/Modules/Orchard.Search/packages.config
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config
#	src/Orchard.Web/Modules/Orchard.Setup/packages.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/Orchard.Templates/packages.config
#	src/Orchard.Web/Modules/Orchard.Themes/packages.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/packages.config
#	src/Orchard.Web/Modules/Orchard.Users/packages.config
#	src/Orchard.Web/Modules/Orchard.Warmup/packages.config
#	src/Orchard.Web/Modules/Orchard.Widgets/packages.config
#	src/Orchard.Web/Modules/Orchard.Workflows/packages.config
#	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
#	src/Orchard.Web/Modules/Orchard.jQuery/Web.config
#	src/Orchard.Web/Modules/Orchard.jQuery/packages.config
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
#	src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
#	src/Orchard.Web/Modules/TinyMce/packages.config
#	src/Orchard.Web/Themes/Themes.csproj
#	src/Orchard.Web/Themes/Web.config
#	src/Orchard.Web/Themes/packages.config
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/ContentManagement/DefaultContentManager.cs
#	src/Orchard/Orchard.Framework.csproj
#	src/Tools/MSBuild.Orchard.Tasks/TypeScriptFiles.cs
 2019-02-20 20:05:18 +01:00
Lombiq
3404e0fe1b Implementing obsolete Media Profiles image cleanup in AzureBlobStorageProvider too 
Same logic as 999ecd0786
 2019-02-20 18:23:50 +01:00
Lombiq
056233c9c5 Optimizing FileSystemStorageProvider.ListProfiles 2019-02-20 18:12:00 +01:00
Lombiq
5d74f4380c Adding connection string for the Azure Storage Emulator to Orchard.Web/Web.config 2019-02-20 16:34:32 +01:00
Lombiq
dd787a1d10 Fixing that FileSystemStorageProvider.ListProfiles changes can cause NRE in DeleteFile and cause test failure 
in CreateFileAndDeleteFileTakesAnySlash if the "_Profiles" folder doesn't exist
 2019-02-20 16:18:37 +01:00
Lombiq
992e79de36 Bumping version number to 1.10.3 2019-02-19 21:00:04 +01:00
Lombiq
6bce539675 Farewell, CodePlex! (Press F to Pay Respects) 2019-02-19 20:42:13 +01:00
Lombiq
824e2992a6 Readme cleanup (#8148) 2019-02-19 20:17:47 +01:00