Merge 1.10.x into dev #8825
Merged
Merge 1.10.x into dev #8825
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oup (#8813) * Projections: Returning empty list of content items instead of every content item when the query has no filters * Better solution to skip processing empty filter groups, instead of returning nothing when there's an empty filter group * Code styling and comments * Code styling in ProjectionPartDriver, QueryPartDriver and ProjectionManager * Reverting functional change to ignore empty filter groups * Code styling in AdminController, ProjectionPartDriver and QueryPartDriver * Adding notification when saving a Query or a ProjectionPart to warn about the effect of an empty filter group * Fixing that upgrading Newtonsoft.Json 13.x broke the SpecFlow test execution app
#8823) * Upgrading MailKit to 4.8.0 and consolidating all NuGet packages * Upgrading MailKit to 4.9.0 and consolidating dependency package versions
# Conflicts: # src/Orchard.Specs/App.Config # src/Orchard.Web.Tests/app.config # src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs # src/Orchard.Web/Orchard.Web.csproj # src/Orchard.Web/Web.config # src/Orchard.Web/packages.config
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Don't merge!
This PR is just for running the build on the merged code, but the branch will be merged manually to keep history.