mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 17:40:26 +01:00
Code Issues Projects Releases Wiki Activity
97,396 Commits 36 Branches 527 Tags
Commit Graph

21910 Commits

Author SHA1 Message Date
Sara Arjona
1d2d4782da Merge branch 'MDL-68654-master' of https://github.com/catalyst/moodle 2020-05-11 19:16:14 +02:00
Andrew Nicols
29c5fafff5 MDL-66109 js: Fix Shifter linting issues 2020-05-11 11:07:49 +08:00
Andrew Nicols
7afd16ad84 MDL-66109 behat: Require newline at EOF 
This change enables the gherkinlint rule to require a new line at the
end of the file. This change is in keeping with existing Moodle coding
style guidelines.
 2020-05-11 11:07:49 +08:00
Andrew Nicols
149d80e819 MDL-66109 behat: Fix Example usage in feature files 
The gherkin-lint package now understands the use of "Examples" and
requries that their indentation be correct and consistent.

This change sets the indentatation for these to:

    "Examples": 4,
    "example": 6,

This is in-line with the examples given in the offical Cucumber/Gherkin
documentation at
https://cucumber.io/docs/gherkin/reference/#scenario-outline whereby the
Examples and individual rows of the Examples table are children of the
Scenario outline.

This is contrary to the default for Gherkin-lint which places them as
top-level nodes with an indentatio of 0, and 2 respectively.
 2020-05-11 10:55:58 +08:00
Andrew Nicols
f879cc518e MDL-66109 js: Build changes for NodeJS upgrade 
This change includes a build to fix all minified file changes in Moodle
as a result of upgrades to our build process.
 2020-05-11 10:55:54 +08:00
Dmitrii Metelkin
774bd482fd MDL-68654 quizaccess: destroy a restore controller in tests 2020-05-10 09:29:16 +10:00
Jake Dallimore
3450a08366 Merge branch 'MDL-68572-master' of https://github.com/catalyst/moodle 2020-05-07 18:30:47 +02:00
Paul Holden
2cd534a7df MDL-68410 mod_scorm: safer status operator comparison. 2020-05-07 09:02:42 +08:00
Sara Arjona
773e46c808 Merge branch 'MDL-68381-master' of git://github.com/ferranrecio/moodle 2020-05-06 17:43:53 +02:00
Dmitrii Metelkin
93532e7871 MDL-68572 quizaccess: use uploaded file as is for SEB settings 2020-05-06 17:13:53 +10:00
Luca Bösch
439c8c5933 MDL-68216 block_recent_activity: Format elements more nicely. 2020-05-05 22:09:19 +02:00
Andrew Nicols
37f48d2547 Merge branch 'MDL-68500' of https://github.com/paulholden/moodle 2020-05-05 09:48:24 +08:00
Sara Arjona
a58e8cb0a1 Merge branch 'MDL-68379-master' of git://github.com/ferranrecio/moodle 2020-05-04 20:02:06 +02:00
Sara Arjona
da2f9f6510 Merge branch 'MDL-67713-master' of git://github.com/ferranrecio/moodle 2020-05-04 19:30:45 +02:00
Ferran Recio
9848594715 MDL-68381 mod_h5pactivity: add attempt duration, completion and success 2020-05-04 18:53:00 +02:00
Ferran Recio
75ba339cdb MDL-68379 mod_h5pactivity: adding item_result to xAPI handler 2020-05-04 18:47:11 +02:00
Ferran Recio
7f5b6adac1 MDL-67713 mod_h5pactivity: adding backup and restore 2020-05-04 18:42:48 +02:00
Paul Holden
8844cb8286 MDL-68500 dataformat: re-factor download/export methods into new class. 2020-05-04 16:01:12 +01:00
Andrew Nicols
3ba4248fe7 Merge branch 'MDL-68502-master' of git://github.com/ferranrecio/moodle 2020-05-04 15:59:04 +08:00
Ferran Recio
b4f617a609 MDL-68502 mod_h5pactivity: fixing get_file_info error 2020-05-04 09:30:32 +02:00
Jun Pataleta
716ac2c902 Merge branch 'MDL-68409-master' of git://github.com/andrewnicols/moodle 2020-05-04 15:22:12 +08:00
Andrew Nicols
47d094817f MDL-68409 behat: Fix tests from modal rewrite 2020-05-04 15:08:11 +08:00
Andrew Nicols
2cc28979f0 MDL-68454 mod_feedback: Update get_context to match parent 2020-05-04 11:52:20 +08:00
Eloy Lafuente (stronk7)
1097530242 Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle 2020-05-01 23:33:08 +02:00
Claude Vervoort
779e753faf MDL-68328 mod_lti: resourcekey and pwd hidden not removed 2020-05-01 15:03:14 -04:00
Andrew Nicols
aa3813b72b Merge branch 'master_MDL-67540' of https://github.com/golenkovm/moodle 2020-05-01 11:20:55 +08:00
Dmitrii Metelkin
327da79b27 MDL-67850 quizaccess: change SEB supported versions 2020-05-01 10:59:36 +08:00
Dmitrii Metelkin
baed1968b5 MDL-67850 quizaccess: fix broken unit tests 2020-05-01 10:59:08 +08:00
Dmitrii Metelkin
4b6c4f6713 MDL-67850 quizaccess: remove invalid white spaces 2020-05-01 10:58:30 +08:00
Eloy Lafuente (stronk7)
fd0344e388 Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle 2020-05-01 00:32:00 +02:00
Jun Pataleta
728b03c049 Merge branch 'MDL-68309-master' of https://github.com/snake/moodle 2020-04-30 09:57:50 +08:00
Jake Dallimore
192a43f109 Merge branch 'MDL-67850-seb-integration-3' of https://github.com/catalyst/moodle 2020-04-30 09:13:14 +08:00
Eloy Lafuente (stronk7)
9b2b1f3fa5 Merge branch 'MDL-68434-master-enfix' of git://github.com/mudrd8mz/moodle 2020-04-29 22:52:40 +02:00
David Mudrák
8599eb5ebb MDL-68434 lang: Use the updated terminology in the tests 2020-04-29 17:40:58 +02:00
Dmitrii Metelkin
78adf6f63a MDL-67850 quizaccess: remove the old quizaccess_safebrowser 
Co-authored-by: Nicholas Hoobin <nicholashoobin@catalyst-au.net>
Co-authored-by: Andrew Madden <andrewmadden@catalyst-au.net>
 2020-04-29 14:29:21 +10:00
Andrew Madden
79f621241c MDL-67850 quizaccess: add Safe Exam Browser access rule plugin 
Co-authored-by: Nicholas Hoobin <nicholashoobin@catalyst-au.net>
Co-authored-by: Dmitrii Metelkin <dmitriim@catalyst-au.net>
 2020-04-29 14:28:54 +10:00
Andrew Nicols
cb8ad9c76e Merge branch 'MDL-68378-master' of git://github.com/rezaies/moodle 2020-04-29 08:19:09 +08:00
Claude Vervoort
f259405d02 MDL-68328 mod_lti: use hidden form when deeplink options disabled 2020-04-28 10:18:03 -04:00
Helen Foster
1fce3f52ac MDL-68434 lang: Import fixed English strings (en_fix) 
Significant string changes:

* pluginnamesummary,qtype_ddimageortext and
  pluginnamesummary,qtype_ddmarker - Note about the question type not
  being accessible to visually impaired users

* addresourceoractivity,core - Removing 'resource' as the new activity
  chooser doesn't have resource types separated
 2020-04-28 14:01:20 +02:00
Eloy Lafuente (stronk7)
724a1a1d1d NOBUG: Fixed SVG browser compatibility 2020-04-28 11:15:46 +02:00
Andrew Nicols
605107b147 Merge branch 'MDL-66259' of https://github.com/stronk7/moodle 2020-04-28 10:19:53 +02:00
Eloy Lafuente (stronk7)
06248a23d4 Merge branch 'MDL-67701-master' of git://github.com/ferranrecio/moodle 2020-04-27 17:36:49 +02:00
Mikhail Golenkov
8c287a6696 MDL-67540 quiz: Start transaction before selecting existing slots. 
Co-authored-by: Conn <conn@cmrwarwicker.com>
 2020-04-26 10:54:14 +10:00
Tim Hunt
5c3f700ac7 MDL-66259 quiz responses: fix unrealistic test setup 2020-04-24 15:56:23 +02:00
Ferran Recio
05da45ccf2 MDL-67701 mod_h5pactivity: new activity icon 2020-04-22 11:31:13 +02:00
Shamim Rezaie
df35a03367 MDL-68378 forumreport_summary: action menu listens to accessibleChange 2020-04-22 04:16:44 +10:00
Adrian Greeve
5d1ff2aa96 Merge branch 'MDL-66920' of https://github.com/Cvmcosta/moodle 2020-04-20 08:28:25 +08:00
carlos
32591786d9 MDL-66920 mod_lti: Allow usage of both JWKS URI and Public Key 
- Changed mod_lti edit_form.php to add necessary fields.
- Added configuration field 'keytype' that can be RSA_KEY or JWK_KEYSET, defaulting to RSA_KEY if none is found.
- Changed mod_lti locallib.php to add the usage of jwk in the verifications of jwt's.
- Changed mod_lti token.php to call the verification function from locallib.php.
- Caches the keyset endpoint content of any given lti tool.
- Updated language files to accommodate new functionalities.
- Added test method for JWK functionalities.
- Added test_keyset file in the fixtures folder.
- Bumped the mod_lti version to 2020022200.
 2020-04-16 08:53:53 -03:00
Sara Arjona
0720504587 Merge branch 'MDL-67788-master' of git://github.com/ferranrecio/moodle 2020-04-15 09:53:03 +02:00
Adrian Greeve
06b1f01216 Merge branch 'MDL-67663-master-3' of git://github.com/junpataleta/moodle 2020-04-15 13:19:18 +08:00