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

V14/merge #14589

Merged
merged 28 commits into from Jul 21, 2023
Merged

V14/merge #14589

merged 28 commits into from Jul 21, 2023

Commits on Jun 27, 2023

  1. Added missing Danish translation for general_change (#14461)

    * Added missing Danish translation for `general_change`
    
    * Update en_us.xml
    abjerner committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    a090997 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d14158 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Fix broken CookieAuthenticationRedirect caused by PR #14036 for non-a…

    …pi requests (#14399)
    
    * Fix broken CookieAuthenticationRedirect caused by PR #14036 when not in an API controller
    
    * Added Integration Tests for the MemberAuthorizationFilter
    
    * Fix merge conflict
    
    ---------
    
    Co-authored-by: Elitsa <elm@umbraco.dk>
    mwillebrands and elit0451 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1d239a3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4c524d View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Updated the package validation baseline version to 12.0.0 (#14389)

    * Updated the package validation baseline version to 12 RC1
    
    * Update PackageValidationBaselineVersion to 12.0.0 and remove CompatibilitySuppressions.xml files
    
    * Clean up project files
    
    ---------
    
    Co-authored-by: Ronald Barendse <ronald@barend.se>
    bergmania and ronaldbarendse committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    41805af View commit details
    Browse the repository at this point in the history
  2. Fixes #12904 UmbracoHelper.GetDictionaryValue defaults to en-US when …

    …used in non-front end code (#12942)
    
    * adding new overload/rename a method
    
    * remove this keyword
    
    * fix comment
    
    * remove space
    
    * commit
    
    * revert
    
    * replace param name
    
    * public backward compatibility
    
    * Minor style tweaks
    
    * Don't change default culture in UmbracoCultureDictionary
    
    ---------
    
    Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
    uppercuut and nikolajlauridsen committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    0da33d0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0c595cc View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Configuration menu
    Copy the full SHA
    dd697ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2b62969 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Bump tough-cookie from 4.1.2 to 4.1.3 in /src/Umbraco.Web.UI.Client

    Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
    - [Release notes](https://github.com/salesforce/tough-cookie/releases)
    - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
    - [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)
    
    ---
    updated-dependencies:
    - dependency-name: tough-cookie
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and iOvergaard committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9926311 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    531ad2e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d52dcb7 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. V10: Find and persist embedded images in rich text (#14546)

    * add method to find and persist embedded base64 (data-uri) images in a html string
    
    * use method to find embedded images in the Umbraco.TinyMce and Umbraco.Grid property editors
    
    * rename method to better reflect what it does
    
    * set allowed upload file types for integration tests
    
    * add test for embedded images in Umbraco.TinyMce
    
    * let old ctor call new ctor
    
    * Apply suggestions from code review
    
    Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
    
    * apply pattern matching
    
    ---------
    
    Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
    iOvergaard and Zeegaan committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ab836d2 View commit details
    Browse the repository at this point in the history
  2. V12: Add ISO codes to make the migration from language IDs easier (#1…

    …4567)
    
    * Change the obsoletion messages for language IDs to target V14 instead of V13.
    
    * Wrong Language file
    
    * Add ISO codes required to migrate custom code from language IDs
    
    * Population of the new language FallbackIsoCode prop
    
    * Changing obsoletion msgs from v13 to v14
    
    * Fix breaking changes
    elit0451 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ba423a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dad49b8 View commit details
    Browse the repository at this point in the history
  4. Restored order of operations on scope dispose to that used in Umbraco…

    … 11 before refactor into Scope inheriting CoreScope. (#14573)
    AndyButland committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d1aac39 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. remove submodule

    iOvergaard committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    43b44b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4824fc8 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Configuration menu
    Copy the full SHA
    3a857ab View commit details
    Browse the repository at this point in the history
  2. Extends JSON schema/Intellisense to full details of InstallDefaultDat…

    …a settings. (#14568)
    
    * Fixes an incorrect property name used for generating JSON schema.
    
    * Added JSON schema/intellisense for default data dictionary keys.
    
    * Renamed private variable to match setting name.
    AndyButland committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    0ae404c View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge remote-tracking branch 'origin/v10/dev' into v11/dev

    # Conflicts:
    #	src/JsonSchema/AppSettings.cs
    #	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
    nikolajlauridsen committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0884ee0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    04a10be View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/v12/dev' into v13/dev

    # Conflicts:
    #	Directory.Build.props
    nikolajlauridsen committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    28dae03 View commit details
    Browse the repository at this point in the history
  4. Merge v13/dev

    nikolajlauridsen committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    7753df4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a4c287f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    90598dc View commit details
    Browse the repository at this point in the history
  7. Undo props changes

    nikolajlauridsen committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    473c272 View commit details
    Browse the repository at this point in the history
  8. Comment out richtext test

    This should no longer be nececary in new backoffice
    nikolajlauridsen committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    7ed856a View commit details
    Browse the repository at this point in the history