Commit Graph

11737 Commits

Author SHA1 Message Date
Benedek Farkas
6f27eb2c4c Updating Orchard.Tests.ContentManagement.HqlExpressionTests.ShouldSortRandomly to decrease failure chance due to randomness 2024-03-08 11:41:17 +01:00
Benedek Farkas
7bbc12d3b8 Adding workflow to run specflow tests as a nightly build 2024-03-08 11:03:02 +01:00
Benedek Farkas
a3e6e4887f Revert "Testing the branch strategy matrix concept to be used for the nightly build"
This reverts commit 1354e367b7.
2024-03-08 10:57:07 +01:00
Benedek Farkas
1354e367b7 Testing the branch strategy matrix concept to be used for the nightly build 2024-03-08 10:49:36 +01:00
Benedek Farkas
1ad1aa278e Removing SpecFlow test execution from the compile workflow 2024-03-08 10:49:08 +01:00
Benedek Farkas
844b60059e Upgrading actions to latest versions
These actions generated the Node.js 16  deprecation warning
2024-03-08 10:48:48 +01:00
Benedek Farkas
984a8ca0ac Merge branch 'dev' into issue/8686-dev 2024-03-07 19:41:28 +01:00
Benedek Farkas
e333952b68 Merge branch 'issue/8684' into dev 2024-03-07 19:40:11 +01:00
Benedek Farkas
fcf960f7e3 Reworking the merge conflict resolution between 1.10.x and dev for the Core.Common and Projections migrations 2024-03-07 16:50:58 +01:00
Benedek Farkas
81b9a6050f Projections: Consolidating Migration Update steps into Create 2024-03-06 16:07:15 +01:00
Benedek Farkas
f167c5fac9 Simplifying the merged migrations in Common and Projections that had conflicts between 1.10.x and dev 2024-02-15 19:40:18 +01:00
Benedek Farkas
b1d1663134 Merge branch 'dev' into issue/8684 2024-02-02 17:12:31 +01:00
Andrea Piovanelli
417af34b4e Added checks to properly display CustomForm content items at front end (#8751)
* Display CustomForm_Wrapper shape only if shape type is Detail.
Publish button has to be visible only if content is draftable AND is set to show the publish button

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.CustomForms/Drivers/CustomFormPartDriver.cs
#	src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Create.cshtml
#	src/Orchard.Web/Modules/Orchard.CustomForms/Views/Parts.CustomForm.Wrapper.cshtml

* Added EditorBuilderWrapper.
2024-01-26 09:12:09 +01:00
Benedek Farkas
64eafbcea8 Merge branch 'issue/8684' into issue/8686-dev 2023-07-19 15:46:28 +02:00
Benedek Farkas
01b3f2429f Resolving Migration step conflict for Orchard.Projections too, fixing logic Orchard.Core/Common 2023-07-18 22:05:59 +02:00
Benedek Farkas
37ab0cd8d1 Updating IndexExists logic to only check indexes that belong to the current tenant (except for Default) 2023-07-18 19:18:20 +02:00
Benedek Farkas
3d389df858 Fixing IndexExists for tenants with a table prefix 2023-07-14 19:53:45 +02:00
Benedek Farkas
8793d4d663 Resolving conflict between 1.10.x and dev in the order of migration steps in Core/Common/Migrations.cs 2023-07-14 15:33:02 +02:00
Benedek Farkas
fa6eae4c34 Merge branch 'dev' into issue/8684 2023-07-12 17:00:49 +02:00
Benedek Farkas
4043df7a0d Consolidating Microsoft.Owin package versions (#8711) 2023-07-12 16:59:34 +02:00
Benedek Farkas
0c3afcd93e Revert "Grabbing the contents of the compile workflow from 1.10.x"
This reverts commit 01ba3cabbc.
2023-07-12 16:58:03 +02:00
Benedek Farkas
01ba3cabbc Grabbing the contents of the compile workflow from 1.10.x 2023-07-12 16:41:14 +02:00
Benedek Farkas
b0b95ceafe Merge remote-tracking branch 'origin/dev' into issue/8684 2023-07-11 15:55:16 +02:00
Benedek Farkas
f1d655d9a8 Merge branch '1.10.x' into issue/8684
# Conflicts:
#	src/Orchard/Orchard.Framework.csproj
2023-07-11 15:53:44 +02:00
Matteo Piovanelli
729f8ddd75 Cache CultureRecords by both Id and Name (#8708) 2023-07-07 09:58:17 +02:00
Matteo Piovanelli
bdba35c704 Fix bug in updating settings for fields (#8703) 2023-06-30 08:51:09 +02:00
Andrea Piovanelli
0b001c76c2 Added flag to display a single model error for MediaLibraryPickerField (#8700)
* Added flag to display model error by LocalizationExtensionHandler if media have been removed from the field only. This ensures that no duplicate model error has displayed.

* Restored formatting for else branches

---------

Co-authored-by: Matteo Piovanelli <MatteoPiovanelli-Laser@users.noreply.github.com>
2023-06-30 08:49:20 +02:00
Marek Dzikiewicz
05079efdd3 Fix mapping records in nested namespaces (#8681) (#8682) 2023-06-29 10:04:23 -07:00
Benedek Farkas
824846036e Merge branch 'dev' into issue/8686-dev 2023-06-29 10:54:20 +02:00
Benedek Farkas
19847d2e95 Merge branch 'issue/8684' into issue/8686-dev
# Conflicts:
#	.github/workflows/compile.yml
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj
2023-06-28 17:18:13 +02:00
Benedek Farkas
2be2ecc99e Disabling test execution for now, as tests will be fixed in the issue/8686-dev branch 2023-06-28 17:16:25 +02:00
Benedek Farkas
642a07f301 Merge branch '1.10.x' into issue/8684
# Conflicts:
#	.github/workflows/compile.yml
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/packages.config
#	src/Orchard.Specs/Blogs.feature.cs
#	src/Orchard.Specs/DateTime.feature
#	src/Orchard.Specs/DateTime.feature.cs
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs
#	src/Orchard.Web/Web.config
#	src/Orchard.sln
2023-06-28 17:05:51 +02:00
Benedek Farkas
731b223f82 8686: Fixing build and tests on 1.10.x (#8687)
* Fixing that RecipeManagerTests failed due to HttpContext not being available

* Fixing OwnerEditor tests in CommonPartProviderTests as the owner editor now checks for a different permission since 5b0c82d1ad

* Fixing typo in CommonPartProviderTests.UpdateModelStub class name

* Fixing that test cases for invalid path in FileSystemStorageProviderTests broke in a3e9bef3ca (issue #6802, PR #6919)

I should review PRs more carefully!

* Fixing CurrentCultureWorkContextTests

* Fixing indentation in DefaultDateFormatterTests

* Updating Orchard.Azure.Web's required version of System.Web.Mvc to match the rest of the solution

* Orchard.Specs: Fixing assembly loading errors when starting up the web host by adding binding redirects

* Adding empty compile workflow from dev

* Adding the compile workflow's actual contents

* Changing default shell to pwsh (msbuild was not found in cmd?)

* Adding msbuild to PATH

* Removing unused references to System.Net.Http

* Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental)

* Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency

* Orchard.proj: Spec target actually depends on only the Compile target, not Package-Stage (experimental)

* Compile workflow: Testing the Test and Spec targets

* Fixing Test step

* Fixing compile workflow to also mark Razor compilation warnings as errors

* Restoring Orchard.Specs/Hosting/Orchard.Web/Web.config to match Orchard.Web's web.config closer

so that it loads assemblies from the Dependencies folder.
This fixes the error with Autofac not being able to resolve dependencies for DefaultOrchardShell

* Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs: Workaround for AntiForgeryToken bug in ASP.NET MVC since version 5.2.4

https://github.com/aspnet/AspNetWebStack/issues/162

* Revert "Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental)"

This reverts commit 087f2849b1.

* Revert "Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency"

This reverts commit be2ba866e3.

* Reverting the addition of assembly binding redirects to Orchard.Specs/Hosting/Simple.Web/Web.config

since it doesn't need them like Orchard.Specs/Hosting/Orchard.Web/Web.config does

* Disabling Test and Spec execution for now

* Orchard.Framework: Making the System.Net.Http not-private to prevent an outdated version sticking around

* Orchard.Workflows: Adding assembly binding redirect for System.Net.Http to avoid Razor compilation warning

* Moving the System.Net.Http assembly redirect to Orchard.Web

* Specs: Fixing "I can create browse blog posts on several pages" Blog test's usage of "I should not see" and correcting the parameters too

because unlike "I should see", this is not a regex match, just contains

* Specs: Fixing "I can create browse blog posts on several pages" Blog test's flakyness due to timing

because the blog posts are created quickly after one another and the lack of millisecond-precision can cause
the blog posts to appear out of order of creation

* Specs: Media test simplified since the Orchard.Media feature is deprecated

* Adding step to the Compile workflow to upload the MSBuild binlog results

* Pinning the referenced version of System.Net.Http to 4.2.0.0 to prevent Razor compilation warning

System.Net.Http is known to have such problems across different framework versions ways of referencing it

The original warning is:
ASPNETCOMPILER : error : The following assembly has dependencies on a version of the .NET Framework that is higher than the target and might not load correctly during runtime causing a failure: Orchard.Workflows, Version=1.10.3.0, Culture=neutral, PublicKeyToken=null. The dependencies are: System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a. You should either ensure that the dependent assembly is correct for the target framework, or ensure that the target framework you are addressing is that of the dependent assembly. [D:\a\Orchard\Orchard\src\Orchard.Web\Modules\Orchard.Workflows\Orchard.Workflows.csproj

* Re-enabling the Test step

* Re-enabling the Specs step

* Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version

* Revert "Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version"

This reverts commit e4f5632236.

* Orchard.Specs: Adding Settings feature

* Orchard.Specs: Updating DateTime.CreatingAndUsingDateTimeFieldsInAnotherCulture structure without functional change

* Orchard.Specs: Updating Settings.AddingANewSiteCultureAndSelectingItAsTheDefaultWorks to correctly detect that a culture that wasn't added before can be set as default

* Fixing Newtonsoft.Json references

* Specs: Workaround for the DefineDefaultCulture binding and removing the Settings feature which is now redundant with CreatingAndUsingDateTimeFieldsInAnotherCulture

* Updating the compile workflow to run the build + tests on PR, dev and 1.10.x commits

* Adding the compile workflow to the solution
2023-06-28 15:11:46 +02:00
Benedek Farkas
2ff3ef463f Revert "Adding the compile workflow to the solution"
This reverts commit dd512b4ae6.
2023-06-28 14:34:15 +02:00
Benedek Farkas
9c90dfb830 Revert "Updating the compile workflow to run the build + tests on PR, dev and 1.10.x commits"
This reverts commit 711e827258.
2023-06-28 14:34:00 +02:00
Benedek Farkas
711e827258 Updating the compile workflow to run the build + tests on PR, dev and 1.10.x commits 2023-06-28 14:27:28 +02:00
Benedek Farkas
dd512b4ae6 Adding the compile workflow to the solution 2023-06-28 14:26:51 +02:00
Andrea Piovanelli
bf0c71c4f0 Added lock on md5 variable to avoid concurrent hash generations for feature list. (#8697) 2023-06-19 10:04:24 +02:00
Andrea Piovanelli
0485e44378 filterTaxonomyCulture function is now named with a proper unique name, based on part and field (#8702)
* Checked back previously selected terms after replacing the TaxonomyField markup.

* Checkbox reset before checking back selected items.

* Javascript functions to refresh localized terms are now named to be unique. For this purpose, added PartName property to LocalizedTaxonomiesViewModel.

* Code refactoring: added variables for part-field differentiator and function name.
2023-06-19 10:02:08 +02:00
Benedek Farkas
4e609d8de6 Updating comments in src/Orchard.Web/Core/Common/Migrations.cs 2023-06-01 17:16:44 +02:00
Benedek Farkas
380c009614 Updating src/Orchard.Web/Core/Common/Migrations.cs steps to remain compatible with dev instead of 1.10.x 2023-06-01 17:11:29 +02:00
Benedek Farkas
3d119c653a Removing non-existing file from NHibernate.Linq.csproj 2023-05-31 14:15:48 +02:00
Benedek Farkas
cb12c378fb Re-enabling the Spec step 2023-05-26 15:31:56 +02:00
Benedek Farkas
2e22e5c86f Specs: Updating the Newtonsoft.Json binding redirect in the spec app's web.config 2023-05-26 15:16:15 +02:00
Benedek Farkas
9c8e5594cf Fixing that MembershipServiceTests should use IPasswordService, also making SaltAndPasswordShouldBeDifferentEvenWithSameSourcePassword test parameters more readable 2023-05-26 15:05:11 +02:00
Benedek Farkas
17bd0e58e4 Fixing initialization errors in AccountControllerTests 2023-05-26 15:04:35 +02:00
Benedek Farkas
d14aafba8e Fixing initialization errors in ShellDescriptorManagerTests 2023-05-26 15:03:10 +02:00
Benedek Farkas
9934255e6f Fixing initialization errors in ModuleStepTest and ThemeStepTest 2023-05-26 15:02:36 +02:00
Benedek Farkas
03a0361d76 Orchard.Tests.Modules: Adding missing reference to Iesi.Collections (that doesn't cause a build error, just when running tests) 2023-05-26 14:54:43 +02:00
Benedek Farkas
68a03c5675 Updating Orchard.Tests/UI/Resources/ResourceManagerTests.cs according to ResourceManager API change in ac11024be4
and removing obsolete tests
2023-05-26 12:49:32 +02:00