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 1 Packages Projects Releases Wiki Activity
11,631 Commits 94 Branches 33 Tags
c16f73e9eeaa5b4044216bb5f547315d22967334
Commit Graph
37 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedek Farkas c16f73e9ee Grabbing compile workflow from the issue/8686 branch, but disabled the Spec step 2023-05-25 20:32:07 +02:00
Benedek Farkas bda44db94a Fixing Orchard.Tests.Modules.csproj 2023-05-25 20:14:08 +02:00
Benedek Farkas 3f317e33fa Adapting ProjectionPartEditorEvents according to updated services 2023-05-25 20:03:31 +02:00
Benedek Farkas 0f12e29ad5 Updating Orchard.Projections/Migrations.cs after merge to fix version number conflict 2023-05-25 20:02:30 +02:00
Benedek Farkas aa811bc41e Fixing auto-merge mistakes 2023-05-25 20:01:45 +02:00
Benedek Farkas 1a81d95545 Merge branch 'dev' into issue/8684 2023-05-25 19:31:58 +02:00
Benedek Farkas 49fe610e33 Merge branch '1.10.x' into issue/8684 2023-05-25 19:30:22 +02:00
Benedek Farkas 2ef2ad8e99 Adding empty compile workflow to build off of in the current testing branches 2023-05-18 16:25:18 +02:00
Benedek Farkas b2f605eddf Fixing target framework and System.Web.Mvc reference version in a few module's web.config 2023-05-17 19:52:46 +02:00
Benedek Farkas 4f2cbdecc1 Orchard.Azure.Tests: Fixing app framework version and Newtonsoft.Json package reference path 2023-05-17 19:08:36 +02:00
Benedek Farkas 39454704a0 Orchard/Security: Removing User property from PasswordHistoryEntry, since it's inherited from PasswordContext since 882fb8eca5 2023-05-17 18:38:45 +02:00
Benedek Farkas 610b3c4f53 Fixing warning in Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml (LimitConcurrentUploads is a non-nullable int) 2023-05-17 18:33:02 +02:00
Benedek Farkas 0510505651 Merge branch '1.10.x' into issue/8684 
# Conflicts:
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Web.config
#	src/Orchard.Core.Tests/App.config
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Core.Tests/packages.config
#	src/Orchard.Profile/App.config
#	src/Orchard.Specs/App.Config
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Specs/Orchard.Specs.csproj
#	src/Orchard.Specs/packages.config
#	src/Orchard.Tests.Modules/App.config
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests.Modules/packages.config
#	src/Orchard.Tests/App.config
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Tests/packages.config
#	src/Orchard.Web.Tests/app.config
#	src/Orchard.Web/Core/Common/Migrations.cs
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs
#	src/Orchard.Web/Core/Web.config
#	src/Orchard.Web/Modules/Lucene/Lucene.csproj
#	src/Orchard.Web/Modules/Lucene/Web.config
#	src/Orchard.Web/Modules/Lucene/packages.config
#	src/Orchard.Web/Modules/Markdown/Web.config
#	src/Orchard.Web/Modules/Orchard.Alias/Web.config
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config
#	src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
#	src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config
#	src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
#	src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config
#	src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
#	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
#	src/Orchard.Web/Modules/Orchard.Autoroute/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
#	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
#	src/Orchard.Web/Modules/Orchard.Azure/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure/packages.config
#	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
#	src/Orchard.Web/Modules/Orchard.Blogs/Web.config
#	src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj
#	src/Orchard.Web/Modules/Orchard.Caching/Web.config
#	src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
#	src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config
#	src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
#	src/Orchard.Web/Modules/Orchard.Comments/Web.config
#	src/Orchard.Web/Modules/Orchard.Conditions/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
#	src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
#	src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
#	src/Orchard.Web/Modules/Orchard.Email/Web.config
#	src/Orchard.Web/Modules/Orchard.Email/packages.config
#	src/Orchard.Web/Modules/Orchard.Fields/Web.config
#	src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
#	src/Orchard.Web/Modules/Orchard.Forms/Web.config
#	src/Orchard.Web/Modules/Orchard.Forms/packages.config
#	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
#	src/Orchard.Web/Modules/Orchard.ImportExport/Web.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.Indexing/Web.config
#	src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj
#	src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config
#	src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config
#	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
#	src/Orchard.Web/Modules/Orchard.Layouts/Web.config
#	src/Orchard.Web/Modules/Orchard.Layouts/packages.config
#	src/Orchard.Web/Modules/Orchard.Lists/Web.config
#	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
#	src/Orchard.Web/Modules/Orchard.Localization/Web.config
#	src/Orchard.Web/Modules/Orchard.Media/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj
#	src/Orchard.Web/Modules/Orchard.MessageBus/Web.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/packages.config
#	src/Orchard.Web/Modules/Orchard.Migrations/Web.config
#	src/Orchard.Web/Modules/Orchard.Modules/Web.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
#	src/Orchard.Web/Modules/Orchard.OutputCache/Web.config
#	src/Orchard.Web/Modules/Orchard.Packaging/Web.config
#	src/Orchard.Web/Modules/Orchard.Pages/Web.config
#	src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Projections/Web.config
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.PublishLater/Web.config
#	src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
#	src/Orchard.Web/Modules/Orchard.Recipes/Web.config
#	src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj
#	src/Orchard.Web/Modules/Orchard.Redis/Web.config
#	src/Orchard.Web/Modules/Orchard.Redis/packages.config
#	src/Orchard.Web/Modules/Orchard.Resources/Web.config
#	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
#	src/Orchard.Web/Modules/Orchard.Roles/Web.config
#	src/Orchard.Web/Modules/Orchard.Roles/packages.config
#	src/Orchard.Web/Modules/Orchard.Rules/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting/Web.config
#	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
#	src/Orchard.Web/Modules/Orchard.Search/Web.config
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config
#	src/Orchard.Web/Modules/Orchard.Setup/Web.config
#	src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
#	src/Orchard.Web/Modules/Orchard.Tags/Web.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Orchard.TaskLease/Web.config
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
#	src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config
#	src/Orchard.Web/Modules/Orchard.Templates/Web.config
#	src/Orchard.Web/Modules/Orchard.Themes/Web.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Web.config
#	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
#	src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
#	src/Orchard.Web/Modules/Orchard.Users/Web.config
#	src/Orchard.Web/Modules/Orchard.Warmup/Web.config
#	src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
#	src/Orchard.Web/Modules/Orchard.Widgets/Web.config
#	src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
#	src/Orchard.Web/Modules/Orchard.Workflows/Web.config
#	src/Orchard.Web/Modules/Orchard.Workflows/packages.config
#	src/Orchard.Web/Modules/Orchard.jQuery/Web.config
#	src/Orchard.Web/Modules/SysCache/SysCache.csproj
#	src/Orchard.Web/Modules/SysCache/Web.config
#	src/Orchard.Web/Modules/SysCache/packages.config
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
#	src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
#	src/Orchard.Web/Modules/TinyMce/Web.config
#	src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
#	src/Orchard.Web/Modules/Upgrade/Web.config
#	src/Orchard.Web/Modules/Upgrade/packages.config
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Themes/Web.config
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Orchard.Framework.csproj
#	src/Orchard/app.config
#	src/Orchard/packages.config
 2023-05-16 12:39:17 +02:00
Benedek Farkas 2dd08dbc04 8642: Adding "Build Crowdin Translation Packages" workflow (#8660) 
* Adding "Build Crowdin Translation Packages" workflow

* Adding PR trigger for testing

* Setting default shell to pwsh

* Changing extension from yaml to yml

* Revert "Adding PR trigger for testing" This reverts commit 8d00815cd5.

* Attempting to use the API key secrets directly

* Updating workflow to use andrii-bodnar/crowdin-request-action

* Removing v1 API call steps

* Fixing the underlying commit hash of the 0.0.2 tag

* Removing PR trigger
 2023-03-22 16:51:49 +01:00
Benedek Farkas 5668919dd4 Projections: "RewriteOutput" bool property of a Layout Property migrated to a tokenized condition text, fixes #6928 (#8275) 2019-09-05 22:08:55 +02:00
Benedek Farkas a3602ce7b0 Core/Common and Users: Adding indices to IdentityPartRecord.Identifier and UserPartRecord.NormalizedUserName (#8269) 
Lombiq Technologies: ORCH-26
 2019-08-26 20:16:30 +02:00
Benedek Farkas 93c6fbef86 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Menu.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameDriver.cs
 2019-08-23 20:36:03 +02:00
Benedek Farkas bbc86d38cd Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
 2019-08-13 17:38:13 +02:00
Benedek Farkas 5b7df36640 Media Library Web Search: Minor updates in settings editors (Lombiq Technologies: ORCH-206) (#8245) 2019-07-17 16:23:45 +02:00
Benedek Farkas b64280174c Orchard.Specs: Fixing package references and assembly redirects (#7524) 2019-05-15 16:42:32 +02:00
Benedek Farkas ff20581899 Sebros/fixes (#8141) 
* Encoding translated user inputs

* Ensure the media whitelist is enforced
 2018-12-03 14:17:10 +01:00
Benedek Farkas c3b11fca44 Upgrading TinyMCE to latest version (#8118) 2018-09-27 12:06:00 -07:00
Benedek Farkas be802146bc Dynamic C# Compilation, Static and Dynamic Razor Compilation with Roslyn (1.10.x) (#7713) 2018-09-19 13:45:23 +02:00
Benedek Farkas fab98c5adb Projections: Updating QueryVersionScopeOptions and ProjectionManager to support Draft-only Queries (#8111) 2018-09-13 22:41:10 +02:00
Benedek Farkas ed0c60c5fd 5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892) 2017-12-21 12:49:53 -08:00
Benedek Farkas 698791aed2 Updating Orchard.Glimpse and Orchard.OpenId to support Dynamic Compilation with C# 6 2017-11-10 15:13:40 +01:00
Benedek Farkas 3d37ded6b0 Updating Orchard.Glimpse and Orchard.OpenId to support View Compilation (#7713) 2017-11-10 15:12:46 +01:00
Benedek Farkas 018f07e1ca Adding missing file to Orchard.Core.csproj 2017-11-10 01:06:10 +01:00
Benedek Farkas d8338df357 Fixing auto-merge errors 2017-11-10 01:01:21 +01:00
Benedek Farkas 7599a25594 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj
 2017-11-10 00:54:02 +01:00
Benedek Farkas 2904d35d91 Enabling C# 6 for Dynamic Compilation and Razor IntelliSense 
Fixes #5408
 2017-11-09 12:04:12 -08:00
Benedek Farkas cdcec3cd8b #7713: View compilation with MSBuild (#7732) 
Fixes #7713
 2017-06-29 21:10:51 +02:00
Benedek Farkas b4c782a4ad Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-15 18:47:52 +01:00
Benedek Farkas 35ab4117ef Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 20:33:24 +01:00
Benedek Farkas 4a0230d88c Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 19:17:54 +01:00
Benedek Farkas 344d9d77be Tiny fix for the "Contribute back" paragraph on the Dashboard index page 2015-03-20 21:24:04 +01:00
Benedek Farkas 790cb94d5b #20033: Fixing that SearchService should filter based on CurrentCultre instead of SiteCulture 
Work Item: 20033
 2013-09-24 23:26:38 +02:00