Merge branches 'stable-catalyst-400' and 'stable-catalyst-fix-resize' into stable-catalyst #67
+3,765
−123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add height if the activity has description
…flicts-stable-catalyst-400
…atalyst-400 Resolve merge conflicts stable catalyst 400
Rename content_type column
* feat: Add support for downloadable H5P via Mobile app * feat: updated cache method, handles video * feat: handle elements inside of canvases * bugfix: fix cron handler context * bugfix: fix background image url detection * feat: add margin on right so user can always scroll * bugfix: force only ttf fonts for ios compatibility * bugfix: fix default ios serif font * feat: match iframe scrollheight to stop inner scrolling * chore: add more docs * docs: update mobile docs * cleanup: move all hvp data to new window namespace * bugfix: add unique id to selectors to mitigate mobile page load race conditions * cleanup: put resizer on window namespace * bugfix: run hvp only after cached assets are loaded * bugfix: mobile resizer handle infinite height content types * bugfix: start completion manager only after H5P is accessible * docs: update mobile docs * bugfix: remove resizer, opt for fixed height instead * bugfix: fix resizer properly * bugfix: fix unit test
chore: fix namespacing issues in 4.2+
This includes: - Bulk update libraries to latest versions - Bulk upgrade content to latest library version - Bulk export libraries (for importing to another site) - Bulk import is already a feature using the existing "Upload Libraries"
Feature: add bulk library actions
fix missing hub uuid error
Increase php time limit for library export/import
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
Update messages.php resolves h5p#562
Update deprecated constant (4.5 compatibility)
Upstream merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TL;DR
Consolidates the active branches and updates the minified js.
Testing
Run
php vendor/bin/phpunit --testsuite mod_hvp_testsuiteand verify the tests pass.Upstream
Ideally we want to just use upstream, or at least submit PRs to upstream.
Our fork has accumulated a fair few changes, we would need to go through them and split it up into suitable issues and PRs.