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.

Sign up for GitHub

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

Jump to bottom

[5.2] Upmerge 2024-05-27 #43542

Merged
merged 7 commits into from
May 27, 2024
Merged

[5.2] Upmerge 2024-05-27 #43542

merged 7 commits into from
May 27, 2024

Commits on May 20, 2024

  1. [4.4] Fix finder helper addContentType duplicate entry for key 'title' ( 

    joomla#43053)
    @Fedik
    Fedik authored May 20, 2024
    Configuration menu
    Copy the full SHA
    500cce3 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. [5.x] Translation Update (joomla#43499) 

    Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Co-authored-by: Harald Leithner <leithner@itronic.at>
Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
    @joomla-translation-bot @bembelimen
    @HLeithner @tecpromotion
    4 people authored May 23, 2024
    Configuration menu
    Copy the full SHA
    fd7d6db View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. DateTime: Don't convert when there is no user (joomla#43521)

    @Hackwar
    Hackwar authored May 26, 2024
    Configuration menu
    Copy the full SHA
    745cef8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Joomla/4.4-dev' into upmerges/2024-05-27

    @bembelimen
    bembelimen committed May 26, 2024
    Configuration menu
    Copy the full SHA
    2ca3737 View commit details
    Browse the repository at this point in the history

  3. Merge pull request joomla#43537 from bembelimen/upmerges/2024-05-27 

    [5.1] Upmerges 2024-05-27
    @bembelimen
    bembelimen authored May 26, 2024
    Configuration menu
    Copy the full SHA
    7e9a304 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge branch '5.1-dev' into 5.2/upmerge/2024-05-27

    @pe7er
    pe7er committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0e65752 View commit details
    Browse the repository at this point in the history

  2. Upmerge 5.1 to 5.2

    @pe7er
    pe7er committed May 27, 2024
    Configuration menu
    Copy the full SHA
    efeeb8f View commit details
    Browse the repository at this point in the history