mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
97,476 Commits 36 Branches 527 Tags
Commit Graph

21920 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
9eb1b08f07 Merge branch 'MDL-68645-master-earlyoutputinit' of git://github.com/mudrd8mz/moodle 2020-05-14 16:35:35 +02:00
Sara Arjona
ccc7a30b3e Merge branch 'MDL-68200-master-take2' of git://github.com/rezaies/moodle 2020-05-14 13:10:01 +02:00
Ferran Recio
4d0241e488 MDL-68241 mod_h5pactivity: remove MOODLE_INTERNAL 2020-05-14 09:13:56 +02:00
Ferran Recio
e28b40695d MDL-68241 mod_h5pactivity: add grading attempts options 2020-05-14 09:13:56 +02:00
David Mudrák
005b00dd9b MDL-68645 output: Do not apply filters when creating calendar events 
Applying filters on an activity module description when using it as a
new calendar event's description is bad m'kay? We need to store the raw
text and apply the filters only when we actually display the text. That
way, filters (such as multi-language content) may actually fully work
and we do not initialise the theme and output machinery.

Additionally, we need to explicitly set the format of the description
text to HTML (because we have converted it to it already). Otherwise it
defaults to the current user's preferred editor format.

This is still a pragmatic hot-fix solution. The proper solution would be
to pass the raw text, format and embedded files.
 2020-05-13 10:03:01 +02:00
Shamim Rezaie
31d401aaa0 MDL-68200 mod_forum: fix invalid format of the time tag on modern view 2020-05-12 15:13:01 +10:00
Shamim Rezaie
b0326f0632 MDL-68200 mod_forum: Fix the invalid date format in the time tags 2020-05-12 15:13:01 +10:00
Jun Pataleta
6e95533c73 MDL-68200 mod_forum: Use core/time_element for the discussion list page 2020-05-12 10:59:02 +10:00
Shamim Rezaie
79364d4cdc MDL-68200 mod_forum: remove address tags 
Reasons:
- The element “h4” must not appear as a descendant of the “address” element
- This element should not contain more information than the contact
information, like a publication date (which belongs in a <time> element)
 element)
 2020-05-12 10:56:29 +10:00
Shamim Rezaie
9f2a68feb4 MDL-68200 mod_forum: single discussion to follow nestet_v2 display rules 2020-05-12 10:56:29 +10:00
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