106263 Commits

Author SHA1 Message Date
Víctor Déniz
402066dac3 Merge branch 'MDL-75907-master' of https://github.com/golenkovm/moodle 2022-10-20 00:20:59 +01:00
Víctor Déniz
fb74611571 Merge branch 'MDL-76033-master' of https://github.com/ilyatregubov/moodle 2022-10-20 00:07:53 +01:00
Jun Pataleta
3a5205dd0a Merge branch 'MDL-75985-master' of https://github.com/andrewnicols/moodle 2022-10-19 21:27:29 +08:00
Ilya Tregubov
85e0a299f3 Merge branch 'MDL-72606-master' of https://github.com/lucaboesch/moodle 2022-10-19 16:04:37 +03:00
Luca Bösch
b56bdb094b MDL-72606 mod_feedback: Change "Answer the questions" button to primary. 2022-10-19 14:51:05 +02:00
Andrew Nicols
0ba4fa53c1 MDL-75985 behat: Return newline character for \n
Somehow part of this commit was lost during the push and/or squash.
2022-10-19 20:26:14 +08:00
Ilya Tregubov
79c81ab577 Merge branch 'MDL-75014-before-session' of https://github.com/brendanheywood/moodle 2022-10-19 15:20:52 +03:00
Ilya Tregubov
3f568024a1 MDL-76033 core: bump version in is_major_upgrade_required
MDL-58266 changes db structure. So upgrade must happen before
accessing any page.
2022-10-19 15:08:44 +03:00
Sara Arjona
2e48556e99 Merge branch 'MDL-76020-master' of https://github.com/mickhawkins/moodle 2022-10-19 13:00:54 +02:00
Sara Arjona
44dfaee450 Merge branch 'MDL-76010' of https://github.com/stronk7/moodle 2022-10-19 12:56:21 +02:00
Michael Hawkins
3df326695e MDL-76020 theme: Add missing support links to footer in Classic theme
The "Services and support" and "Contact site support" links were
missing from the footer in the Classic theme (which now has its own
footer template), so there was no way to navigate to the relevant links.
2022-10-19 17:52:13 +08:00
Jun Pataleta
6ef7513b62 Merge branch 'MDL-75645' of https://github.com/stronk7/moodle 2022-10-19 15:36:42 +08:00
Ilya Tregubov
4f88b1bee7 Merge branch 'MDL-74654-master' of https://github.com/ssj365/moodle 2022-10-19 09:19:31 +03:00
Jun Pataleta
e591f9da66 Merge branch 'MDL-75985-master' of https://github.com/andrewnicols/moodle 2022-10-19 10:56:14 +08:00
Shamiso.Jaravaza
74b2989f13 MDL-74654 mod_bigbluebuttonbn: Add role parameter 2022-10-18 08:27:15 -06:00
Eloy Lafuente (stronk7)
856b593796 MDL-75645 mnet: Stop caching OpenSSLAsymmetricKey keys
The mnet_environment->keypair array contains the following
elements (and more, just focussing on these):
- keypair_PEM : textual representation of the private key.
- certificate : textual representation of the public key.
- privatekey  : OpenSSLAsymmetricKey representation of the private key,
                generated from keypair_PEM. See get_private_key().
- publickey   : OpenSSLAsymmetricKey representation if the public key,
                generated from certificate. See get_public_key().

The last 2 elements in the array are only used as "caching", to avoid
having to call to openssl_pkey_get_private() and
openssl_pkey_get_public() to convert from the textual representation
to the OpenSSLAsymmetricKey representation that is the one required
by a number of openssl functions.

Problems arrive when, as part of the MNet protocol, the mnet_environment
is serialised, because, since PHP 8.0 those OpenSSLAsymmetricKey objects
aren't serialisable any more.

So, as far as they are only used for internal caching it's perfectly ok
to remove the caching bits and use the openssl_pkey_get_xxx() methods
to calculate them under demand.

The alternative to this would be to implement into the mnet_environment
some custom serialisation, skipping those OpenSSLAsymmetricKey
instances, using __sleep(), the Serializabla interface or __serialize(),
but that seems unnecessary because, as explained above, the uses are
really limited and easily replaceable.

That's what this patch does.
2022-10-18 14:30:50 +02:00
Eloy Lafuente (stronk7)
7af4f8b200 MDL-76010 behat: New scenario to verify that manual attempts work
This is basically the manual background that was removed in the
previous commit, with 4 attempts here. Note it includes the 2
waits that are REQUIRED to make it pass in too-quick environments.

If they are removed, they begin to fail because it seems that
the attempts need a minimum of separation between them.
2022-10-18 14:27:53 +02:00
Eloy Lafuente (stronk7)
e349441130 MDL-76010 behat: Move feature to use attempts generator
This moves away from manual attempts and uses the activity
attempts generator instead. Quicker and not exposed to the
problems with clicks, refreshes and missing attempts.

Note that there is a small change in the attempt generator
so, now, when a new attempt is created, if the activity has
tracking enabled, the final result / grades are recalculated.

That's the real behaviour when the activity settings are
changes in the edition form and it's natural to get them
recalculated without having to visit the form. Specifically,
this allows the 1st scenario to pass, because in that scenario
no changes to the form are being performed.

Also, little detail, amend a dupe scenario name.
2022-10-18 14:27:53 +02:00
Sara Arjona
f8d28e4ca6 on-demand release 4.1dev+ 2022-10-18 13:10:13 +02:00
Ilya Tregubov
6237c41397 Merge branch 'MDL-75173-fix' of https://github.com/sarjona/moodle 2022-10-18 10:17:35 +03:00
Sara Arjona
552d687909 MDL-75173 completion: Remove ordering from PHPUnit
To avoid getting some random errors with Oracle, the order for the
students have been removed from the tests (to check they are there,
regardless the order they are returned, because in that case, the
order is not important).
2022-10-18 08:26:47 +02:00
Jun Pataleta
7de314084c Merge branch 'MDL-75783-master' of https://github.com/andrewnicols/moodle 2022-10-18 10:06:29 +08:00
Andrew Nicols
ffac002f0d MDL-75783 javascript: Add optional jsconfig configuration
This commit adds a new Grunt task which generates a jsconfig.json file.

This file is described at
https://code.visualstudio.com/docs/languages/jsconfig and can be used
to configure vscode and other similar editors to understand our module
loading.

This task is an optional task for Grunt and can be run with:

    npx grunt jsconfig

The file is git-ignored and will not affect normal usage.
2022-10-18 09:33:04 +08:00
Víctor Déniz
9ee852a67e Merge branch 'MDL-75983' of https://github.com/stronk7/moodle 2022-10-18 01:07:23 +01:00
Víctor Déniz
587deee8f5 Merge branch 'MDL-72722' of https://github.com/paulholden/moodle 2022-10-18 00:26:24 +01:00
Víctor Déniz
2d80945eba Merge branch 'master_MDL-73122' of https://github.com/marcghaly/moodle 2022-10-17 21:18:57 +01:00
Sara Arjona
2ee1ad4eb7 Merge branch 'MDL-75711-master' of https://github.com/ssj365/moodle 2022-10-17 16:55:52 +02:00
Sara Arjona
771c748a9e Merge branch 'MDL-72836-master' of https://github.com/mickhawkins/moodle 2022-10-17 16:39:49 +02:00
Sara Arjona
3c49d97f1c Merge branch 'MDL-75077' of https://github.com/paulholden/moodle 2022-10-17 16:32:29 +02:00
Sara Arjona
b7ad4d8636 Merge branch 'MDL-74986-master' of https://github.com/call-learning/moodle 2022-10-17 16:16:48 +02:00
Sara Arjona
4aeb22cd26 Merge branch 'MDL-58266-patch2' of https://github.com/ilyatregubov/moodle 2022-10-17 15:45:26 +02:00
Ilya Tregubov
4272ccd65f MDL-58266 core_completion: Fix upgrade script.
Remove 0 default value for timecreated
in course_module_viewed table
2022-10-17 16:40:07 +03:00
Sara Arjona
8d6a2d68e6 Merge branch 'MDL-74814-master-1' of https://github.com/HuongNV13/moodle 2022-10-17 15:30:45 +02:00
Sara Arjona
d66a4ffeb9 Merge branch 'MDL-75173-master' of https://github.com/ilyatregubov/moodle 2022-10-17 15:17:45 +02:00
Sara Arjona
481630e747 Merge branch 'MDL-75664-master' of https://github.com/laurentdavid/moodle 2022-10-17 15:14:32 +02:00
Jun Pataleta
e7bf930aa1 Merge branch 'MDL-74958-master' of https://github.com/sammarshallou/moodle 2022-10-17 21:10:51 +08:00
Ilya Tregubov
d5e9b5ba2b MDL-58266 core_completion: Fix incorrect version bump.
Version was bumped in previously merged issue
2022-10-17 14:49:22 +03:00
Ilya Tregubov
09de114dd2 MDL-58266 core_completion: fix db structure.
Make coursemoduleid, userid fields in new course_modules_viewed
to match those in course_modules_completion table.
2022-10-17 14:49:17 +03:00
sam marshall
b5e805071a MDL-74958 core_navigation: Add renamed classes to renamedclasses.php
The renamed secondary navigation classes have been adeed to
renamedclasses.php files.
2022-10-17 10:54:24 +01:00
Ilya Tregubov
057f732bf1 Merge branch 'MDL-58266-master' of https://github.com/JBThong/moodle 2022-10-17 12:51:59 +03:00
Shamim Rezaie
9708ad500b Merge branch 'MDL-55580_master' of https://github.com/marxjohnson/moodle 2022-10-17 19:19:36 +11:00
Laurent David
e861d7b0ad MDL-75664 mod_data: Approval status in database entries
* Add approval status in the default template.
* Change the language string for unapproved entries.
2022-10-17 09:55:11 +02:00
Ilya Tregubov
b1ebbfe3ac Merge branch 'MDL-56567-master' of https://github.com/matthewhilton/moodle 2022-10-17 09:04:48 +03:00
Huong Nguyen
0795b579fa MDL-74814 forms: Fix accessibility issue in edit profile page
- Fixed legend tag issue
 - Modified the passwordunmask Javascript hide/unhide the password field by CSS class
2022-10-17 09:31:53 +07:00
Matthew Hilton
cfb643293c MDL-56567 competency: Course module competency option to override grade
Previously, if a course module had already been graded, course module
completion linked to the course module would not update. This
commit adds the option to enable overriding the grade at the course
module competency level.

This ensures that if enabled and a user completes a module associated
with a competency, that competency will be graded appropriately.
2022-10-17 08:00:20 +10:00
Andrew Nicols
febd5d944c MDL-75985 behat: Standardise HTML output when comparing editor content
This commit adds a standardise_html function and updates the matches
function to compare normalised content.

This allows for a wider variety of valid editor output to be handled
using the standard value matching steps in Behat, thus supporting
editors other than Atto better.
2022-10-14 23:44:56 +08:00
Víctor Déniz
ab764c0062 Merge branch 'MDL-75736-master' of https://github.com/sammarshallou/moodle 2022-10-14 16:09:01 +01:00
Eloy Lafuente (stronk7)
41a6551dfe MDL-75983 gha: Update used actions to be node16 compatible
Node12 is being deprecated in github for actions:

https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/

So we need to ensure we are using node16 actions.
2022-10-14 13:27:20 +02:00
Sara Arjona
3bc792b9b8 on-demand release 4.1dev+ 2022-10-14 12:50:19 +02:00
Sara Arjona
8523faeabc NOBUG: Fixed SVG browser compatibility 2022-10-14 12:50:16 +02:00