Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#8791: Merge 1.10.x into dev #8792

Merged
merged 5 commits into from
Apr 19, 2024
Merged

#8791: Merge 1.10.x into dev #8792

merged 5 commits into from
Apr 19, 2024

Commits on Apr 18, 2024

  1. 6748: Stricter file and folder name validation (#6792)

    * Media Library: More strict file and folder name validation, fixes #6748
    
    * Resetting MediaLibraryService changes to 1.10.x
    
    * Code styling in FileSystemStorageProvider
    
    * Adding string file and folder name validation to FileSystemStorageProvider, so that MediaLibrary components don't need to do it separately
    
    * Applying the same file and folder name validation to AzureFileSystem too
    
    * Code styling and fixes in AzureFileSystem, MediaLibrary and IStorageProvider
    
    * Simplifying invalid character detection
    
    * Code styling
    
    * Adding InvalidNameCharacterException to be able to handle invalid characters precisely at various user-facing components
    
    * Updating MediaLibrary not to log an error when a file can't be uploaded due to invalid characters
    
    ---------
    
    Co-authored-by: Lombiq <github@lombiq.com>
    BenedekFarkas and LombiqTechnologies committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0b86413 View commit details
    Browse the repository at this point in the history
  2. #6793: Adding a content-independent culture selector shape for the fr…

    …ont-end (#8784)
    
    * Adds a new CultureSelector shape for front-end
    
    * fixed query string culture change
    
    * Moving NameValueCollectionExtensions from Orchard.DynamicForms and Orchard.Localization to Orchard.Framework
    
    * Code styling
    
    * Simplifying UserCultureSelectorController and removing the addition of the culture to the query string
    
    * EOF empty lines and code styling
    
    * Fixing that the main Orchard.Localization should depend on Orchard.Autoroute
    
    * Code styling in LocalizationService
    
    * Updating LocalizationService to not have to use IEnumerable.Single
    
    * Matching culture name matching in LocalizationService culture- and casing-invariant
    
    ---------
    
    Co-authored-by: Sergio Navarro <jersio@hotmail.com>
    Co-authored-by: psp589 <pablosanchez589@gmail.com>
    3 people committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    15cad85 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. #8640: Fixing consistency between different Enumeration Field flavors…

    …' data storage (#8789)
    
    * Reworking EnumerationField's logic to store/retrieve its (selected) values
    
    * Fixing exception when creating new item with CheckboxList flavor, adding more nullchecks and compactness
    
    * Code styling in EnumerationFieldDriver
    
    * Code styling in EnumerationField editor template
    
    * Fixing that EnumerationFieldDriver and the EnumerationField editor template should read SelectedValues instead of Values directly
    
    ---------
    
    Co-authored-by: Matteo Piovanelli <MatteoPiovanelli-Laser@users.noreply.github.com>
    BenedekFarkas and MatteoPiovanelli-Laser committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fdbb06b View commit details
    Browse the repository at this point in the history
  2. Merge branch '1.10.x' into issue/8791

    # Conflicts:
    #	src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
    #	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
    #	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
    #	src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs
    #	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
    BenedekFarkas committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    0bce8e6 View commit details
    Browse the repository at this point in the history
  3. Fixing merge

    BenedekFarkas committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    23fb9df View commit details
    Browse the repository at this point in the history