Merge changes into master branch so we can use master as the default #15
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
Removed code to show this activity's title and description as this is now handled by the activity header class in Moodle 4.0 (see MDL-72413 and https://moodledev.io/docs/devupdate#the-activity-header-class). # Conflicts: # version.php
This commit adds a workaround to the YUI code to handle the fact that node.getX()/getY() return coordinates based on the current browser viewport rather than the page. This had the result that if the rearrange.php page has been scrolled isoutofbounds() may return true -- preventing the element from being repositioned -- even though it is within the PDF's area. This fix re-reads the PDF area's position within isoutofbounds() so that the coordinates for the PDF area have the same system as the element being moved. This change is required for Moodle 4.0, in Moodle 3.11 the coordinates system between PDF area and elements remains consistent despite any scrolling. I have no idea where this change in behaviour has originated (YUI lib? CSS? Something else?).
Co-authored-by: David OC <[email protected]> Co-authored-by: Peter Miller <[email protected]> Co-authored-by: Oscar Nadjar <[email protected]> Co-authored-by: Michael Milette <[email protected]>
feat: LMSDEV-6465 Added main section element to custom certificate co…
…customcert into LMSDEV-6592
Fix: LMSDEV-6592 deleted section select names for global templates to work
fix: LMSDEV-6617 fixed mobileapp cert download
Reasoning for this change: - We need $SESSION->forcelang to be set in order for the filter chain to work properly. This gets set by calling the moodle lib function force_current_language. - mod_customcert was not calling force_current_language IF the user's language was equal to the certificate's forced language. - This caused the following issue: A user with language en, in a session where the language was set to es_mx, viewing the forced-English-language certificate, would see a spanish section title instead of an English section title. - As a fix, we should not worry about what the user's "preferred" language is when we're deciding whether to force a language. All we care about is the current session's language.
fix: LMSDEV-6741 Query current language instead of user language
feat: Added custom element for summary of curso elements
removed compuesto por string from template
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.
For other plugin repos that we have forked and modified,
masteris the default branch, not aprende_xxxx_dev. As per this conversation with Yair, I'm proposing merging our changes into master, then setting master as default.