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

Merge upstream into catalyst stable #3

Merged
merged 921 commits into from
Sep 18, 2024

Conversation

ScottVerbeek
Copy link

Pull in all changes made in upstream into catalyst stable. There were two conflicts.

  1. .github/workflows/moodle-ci.yml: Accepted incoming upstreams changes. They had newer code, allowing testing of 8.0 and MOODLE_402_STABLE branches.
  2. tests/fixtures/test_base.php: Marked these changes, saw no difference so accepted incoming.
<<<<<<< HEAD
                $fixedbase = sprintf("%.${decimals}E", (float)$matches[0]);
=======
                $fixedbase = sprintf("%.{$decimals}E", (float)$matches[0]);
>>>>>>> upstream/master  

smmercuri and others added 30 commits October 26, 2023 12:01
Release candidate for v4.4.6.
@golenkovm
Copy link
Collaborator

Hey @ScottVerbeek thanks heaps for raising this. The change is massive and I couldn't find any evidence that it was tested somewhere. I am doing an upgrade for one of our clients that will be on php8.1 and need some of these fixes. I will point their codebase to your source branch and send it to QA. If nothing comes back could go ahead and merge it. I assume the testing might take a month or something.

Cheers,
Misha

@jwcatau
Copy link

jwcatau commented Mar 12, 2024

Hi @ScottVerbeek and @golenkovm
Likewise, thanks for this. We'll be doing the same thing with QA on this and look to support this merge with any updates from testing.
Regards,
James.

@golenkovm
Copy link
Collaborator

We had a couple of Production sites on the source branch for a while. Happy to have this merged 👍

@golenkovm golenkovm merged commit aee5572 into catalyst-stable Sep 18, 2024
12 of 14 checks passed
golenkovm pushed a commit that referenced this pull request Sep 18, 2024
Vector Calculus and contrib changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.