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

Upstream merge #65

Merged
merged 16 commits into from
Dec 2, 2024
Merged

Upstream merge #65

merged 16 commits into from
Dec 2, 2024

Conversation

Peterburnett
Copy link
Collaborator

No description provided.

falcon-git and others added 16 commits June 12, 2023 09:49
* JI-5522 disably activityheader for embed in moodle4.0+

* JI-5522 fix resizing for embedded h5ps
…ble to turn off (h5p#555)

* JI-5044 Turn Content Hub on by default

* JI-5044 Update fallback value for getOption

* JI-5044 Add missing translations

* JI-5044 Update translations

---------

Co-authored-by: Lars-Magnus Underhaug <[email protected]>
Resolves 4.5 compatibility - install failure h5p#562
Replaced MESSAGE_DEFAULT_LOGGEDIN + MESSAGE_DEFAULT_LOGGEDOFF to MESSAGE_DEFAULT_ENABLED as per Moodle plugin upgrade documentation: https://github.com/moodle/moodle/blob/13c12756b4d7e85f2d2e34038216179fd287c9c2/lib/upgrade.txt#L716

Thanks @otacke and @lkcivan
@matthewhilton
Copy link

CI is failing because of phpcs, but checked and the unit tests are good. The changes also seem somewhat trivial so no concerns there.

@matthewhilton matthewhilton merged commit 68e4add into stable-catalyst-400 Dec 2, 2024
7 of 24 checks passed
@matthewhilton matthewhilton deleted the upstream-merge branch December 2, 2024 22:18
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.

8 participants