Merge 1.10.x into dev
#8842
Open
Merge 1.10.x into dev
#8842
Conversation
This file contains hidden or 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
… (#8824) * Revert "#8640: Fixing consistency between different Enumeration Field flavors' data storage (#8789)" This reverts commit fdbb06b. * Re-adding change to fix that changing the ListMode of an EnumerationField from a multi-select to a single-select flavor shouldn't break the editor * Code styling in Fields/Enumeration.Edit.cshtml
…8829) * #8828: Expose Redis API to clear multiple keys using wildcard syntax * #8828: Rename IRedisCacheStorageProvider to ICacheStorageProviderWithKeyPrefix * Moving ICacheStorageProviderWithKeyPrefix to Orchard.Caching --------- Co-authored-by: Benedek Farkas <[email protected]>
* Added publish and delete buttons to backoffice content edit. * Corrected condition for content unpublishing. Managed unpublish and delete button for blogs and widgets. * Some little code refactoring * Added css classes for unpublish-button. Condition for delete button visibility now checks for contentItem.Id > 0 instead of IsNew() function * Removed UnpublishButton from Widget Editor. * Removed Widget_DeleteButton to use the generic Content_DeleteButton shape and avoid its duplication or confusing management via Placement.info. * Removed Widget_UnpublishButton shape * Removed unpublish button show/hide logic from driver. Added comments to clarify how new Unpublish and Delete actions work. * EOL fix to Orchard.Widgets.csproj. * Added unpublish button to edit widget (shown if widget is draftable only) * Hide Content edit delete button at frontend * ContentsDriver: removed AdminFilter check to display delete button and checked the content is published before showing the unpublish button. * Applied some of the proposed formatting changes * Several refactoring operations * Autoformatting. * Stylesheet refactoring and reorganization to properly position backoffice buttons * Autoformatting --------- Co-authored-by: Alessandro Agostini <[email protected]> Co-authored-by: Matteo Piovanelli <[email protected]>
# Conflicts: # src/Orchard.Web/Core/Contents/Controllers/AdminController.cs # src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs # src/Orchard.Web/Core/Contents/Placement.info # src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj # src/Orchard.Web/Themes/TheAdmin/Styles/site.css # src/Orchard/Orchard.Framework.csproj
…ion" This reverts commit 4e18292.
* Fine-tuning the compile-node job in the compile workflow * Temporarily disabling the compile job * Splitting up steps in the compile-node job of the compile workflow * Revert "Temporarily disabling the compile job" This reverts commit c130566.
* Testing compile workflow on windows-2025 runners * Wording [skip ci] * Compile workflow: Switch shell to cmd where pwsh is not needed
…hen triggered manually
…ggered manually, take 2 [skip ci]
…t" if the type is not Draftable
…ow to v2.3.0) in Orchard.Profile and Orchard.Specs
…VS extension is no longer needed
… longer packaged since NUnit 2.6.0
…re ContentsDriver now renders one
…tentsDriver already renders one
…inaccessible unless the Menu type is Listable
…r the Unpublish and Delete buttons rendered by the Core ContentsDriver
…e Widget AdminController
…very push to 1.10.x and dev [skip ci]
…not recognizing that a feature file has changed
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.
!!! DO NOT MERGE !!!
Should be merged manually (instead of squash merge) to keep the history.