Compare commits

..

1153 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 8634f2b672 Moodle release 3.8.4 2020-07-12 12:12:53 +02:00
AMOS bot 7ec2bf3776 Automatically generated installer lang files 2020-07-10 19:52:55 +00:00
Eloy Lafuente (stronk7) a6227d5675 weekly release 3.8.3+ 2020-07-10 20:22:15 +02:00
Eloy Lafuente (stronk7) e4d47ed2cc Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-07-10 20:22:09 +02:00
Jake Dallimore 4d069c9339 Merge branch 'MDL-69232-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-10 15:12:11 +08:00
Andrew Nicols 3e741db933 MDL-69232 behat: Simplify hooks
The behat hooks were needlessly complicated which made them much harder
to read, and understand, leading to bugs during development.

These have been significantly simplified to favour clarity over
overloading.
2020-07-10 08:40:30 +08:00
Andrew Nicols 90221b5ccf MDL-69232 behat: Make selenium start more fault tolerant
The session was previously only started once, but has now been moved to
restart between each test. Because of this the `$session->start()` is
now called more frequently which exposes a pre-existing issue whereby
Selenium will periodically fail to start.

When the session was only started at the beginning of the test, and at
occasional other times, it made sense to always stop the test runner
because it signified an issue with obtaining the session at all.

Since the session is restarted more frequently, and now between every
test, it no longer makes sense to do this. The test should only be
_stopped_ if the first attempt to obtain the Session fails. Once a
Session has been retrieved at least once it no longer makes sense to
assume that the failure was a configuration failure, but a connection
failure. Therefore subsequent tests should be attempted.
2020-07-10 08:40:29 +08:00
Jake Dallimore f2de1293e1 Merge branch 'MDL-69135-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-09 10:38:51 +08:00
Michael Hawkins ea79b6597a MDL-68426 theme: Set a limit on paths length in yui_combo
The maximum paths length is now consistent with the YUI loader.
This fix also removes any duplicate paths, so each file is only ever
fetched once.
2020-07-09 10:24:01 +08:00
Andrew Nicols 3b97a56c6a MDL-69232 behat: Add debugging information to Selenium fails 2020-07-09 09:45:35 +08:00
Andrew Nicols 07414b90e3 MDL-69232 behat: Move suite tests to BeforeSuite hook 2020-07-09 09:45:34 +08:00
Eloy Lafuente (stronk7) d49c18bba5 Merge branch 'MDL-69134-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-08 20:53:32 +02:00
Andrew Nicols ecc61a125b Merge branch 'MDL-68784-38' of https://github.com/Peterburnett/moodle into MOODLE_38_STABLE 2020-07-08 12:37:56 +08:00
Andrew Nicols d8538f29c4 Merge branch 'm38_MDL-66322_Travis_Run_Using_Docker_ExtTests' of https://github.com/scara/moodle into MOODLE_38_STABLE 2020-07-08 12:22:20 +08:00
Peter Burnett 881b487433 MDL-68784: Updated variable for graph report 2020-07-08 14:07:35 +10:00
Andrew Nicols e0c0a0c05c Merge branch 'MDL-60494-stray_img_end-38' of https://github.com/leonstr/moodle into MOODLE_38_STABLE 2020-07-08 09:25:11 +08:00
Andrew Nicols 246a03f7dd MDL-69134 competencies: Behat fails randomly opening dialogues 2020-07-08 09:21:54 +08:00
Andrew Nicols 44fd35e8ee Merge branch 'MDL-69109-38-2' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2020-07-08 08:41:07 +08:00
Matteo Scaramuccia a28a24e2f2 MDL-66322 travis: Configure a local copy of 'exttests' 2020-07-07 21:55:47 +02:00
Eloy Lafuente (stronk7) 3639dc845e Merge branch 'MDL-69086-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-07 19:17:29 +02:00
Eloy Lafuente (stronk7) d63c297351 Merge branch 'm38_MDL-68588_Hide_Backuptempdir_From_Message_And_Debuginfo' of https://github.com/scara/moodle into MOODLE_38_STABLE 2020-07-07 19:10:51 +02:00
Eloy Lafuente (stronk7) 54faefbefb Merge branch 'MDL-68784-38' of https://github.com/Peterburnett/moodle into MOODLE_38_STABLE 2020-07-07 18:52:36 +02:00
Víctor Déniz Falcón 735de9020e MDL-69093 enrol_manual: added check for allowed roles a user can assign 2020-07-07 08:33:18 +02:00
Andrew Nicols 71e5f30504 Merge branch 'MDL-69106-38' of git.in.moodle.com:cameron/moodle into MOODLE_38_STABLE 2020-07-07 14:16:48 +08:00
Eloy Lafuente (stronk7) 5b9c5ccf83 Merge branch 'MDL-60827-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-07-07 00:17:35 +02:00
Andrew Nicols 46b6ca69d1 Merge branch 'MDL-69158-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-07-06 12:12:47 +08:00
Jake Dallimore dbd41fa613 Merge branch 'MDL-69136-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-06 10:44:50 +08:00
Michael Hawkins 381f45d005 MDL-69129 report: Limit config changes report sort direction values 2020-07-06 10:11:39 +08:00
Mihail Geshoski 0397309abf MDL-60827 oauth2: Consider requireconfirmation setting on login 2020-07-06 10:05:50 +08:00
Michael Hawkins dca95c6fe4 MDL-69128 admin: Convert HTML entities when populating tasklogs filter 2020-07-06 10:05:05 +08:00
AMOS bot 112fc4d513 Automatically generated installer lang files 2020-07-06 00:08:36 +00:00
Leon Stringer 3b81550b8e MDL-60494 mod_lti: Invalid </img>, example context
<img> was followed by an invalid </img>.  Also added example context for
template so it passes CI checks.
2020-07-05 15:58:35 +01:00
Matteo Scaramuccia 0cf43f11f0 MDL-68588 Backup: Hide ->backuptempdir in exception info 2020-07-03 21:19:12 +02:00
Eloy Lafuente (stronk7) 035f5d9423 weekly release 3.8.3+ 2020-07-03 18:41:29 +02:00
Eloy Lafuente (stronk7) 1bae8bd482 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-07-03 18:41:24 +02:00
Jake Dallimore 3bd1b121ed Merge branch 'MDL-69130-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-07-02 12:08:53 +08:00
Jake Dallimore db58c4cdf2 Merge branch 'MDL-69149-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-02 11:57:34 +08:00
Jake Dallimore b730bb5702 Merge branch 'MDL-69122-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-07-02 11:49:35 +08:00
AMOS bot d45a6dd3c3 Automatically generated installer lang files 2020-07-02 00:08:16 +00:00
Eloy Lafuente (stronk7) 0097d8d481 Merge branch 'MDL-69072-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-07-01 23:24:10 +02:00
Jake Dallimore ef6538a8c7 Merge branch 'MDL-68584-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-07-01 16:43:14 +08:00
Paul Holden fe65ebcf1c MDL-69150 message_airnotifier: correct apps portal link. 2020-07-01 08:39:59 +08:00
Paul Holden bc2d3e8bb9 MDL-69151 message_airnotifier: start output before accesskey request.
This allows debugging generated by the request to be shown on the
page.
2020-07-01 08:30:10 +08:00
Andrew Nicols d6ce289176 Merge branch 'MDL-67172-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-07-01 07:47:53 +08:00
Marina Glancy d690ed3dd3 MDL-69109 theme: try to load icons from the current theme 2020-06-30 10:13:45 +02:00
Marina Glancy 704153c454 MDL-69109 core: use different cache keys for FA icon maps 2020-06-30 10:13:45 +02:00
Cameron Ball 37ee0fd966 MDL-69106 assignfeedback_editpdf: Keep files in conversion queue
In some circumstances, a submission waiting to be converted needs to persist
in the conversion queue so that it can be polled on subsequent cron runs.
2020-06-30 13:59:28 +08:00
Peter Burnett 58bf57d9d3 MDL-68784 scorm: Removed limit on allowed scorm users in report 2020-06-30 15:21:15 +10:00
Luca Bösch 71d4cc2f4e MDL-69158 block_blog_menu: format search form. 2020-06-29 11:13:46 +02:00
Andrew Nicols 913b96cb21 MDL-69136 behat: Improve reliability of navigation steps 2020-06-29 11:36:36 +08:00
Andrew Nicols 7c2fef6484 MDL-69136 behat: Support find on a NodeElement 2020-06-29 11:36:30 +08:00
Andrew Nicols 687c727cf9 MDL-69072 behat: Remove restart_browser_after feature
This is no longer required as the Mink session is restarted after every
test regardless.
2020-06-29 11:05:53 +08:00
Andrew Nicols ee6d899130 MDL-69072 mod_scorm: Stop mink reset after tests
This is now done for all scenarios. It is no longer necessary to do so
specifically for mod_scorm.
2020-06-26 21:17:22 +08:00
Andrew Nicols c18b08912f MDL-69072 behat: Relaunch browser session between scenarios 2020-06-26 21:17:22 +08:00
Andrew Nicols a46018529b MDL-69149 core_grade: Correct xpath attribute selector 2020-06-26 19:59:56 +08:00
Andrew Nicols 5ae95f265a MDL-69135 core_calendar: PendingJS for event filtering 2020-06-26 07:58:36 +08:00
Luca Bösch 456530205e MDL-68584 core_question: flexbox compatible separator for question types
* the br tag does not work well in a flexbox context, a 100% with div
works in both classic and boost.
2020-06-25 21:57:43 +02:00
cescobedo 6bfddeea21 MDL-67172 core_h5p: Prevent synchronous access to save the same h5p
Backport MDL-67095.
When deploying a new H5P resource we need to ensure that
we don't start deploying the same H5P in another thread
(e.g. for another session/user).
2020-06-25 18:42:40 +02:00
Eloy Lafuente (stronk7) 4557b7fed2 weekly release 3.8.3+ 2020-06-25 18:06:27 +02:00
Eloy Lafuente (stronk7) d93d8f65a8 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-06-25 18:06:22 +02:00
Helen Foster 406d9bb40f MDL-69130 lang: Import fixed English strings (en_fix) 2020-06-25 14:30:09 +02:00
Bas Brands a66d07b15c MDL-69122 report_competency: fix clearfix
- a misplaced clearfix caused part of the recontrols to be
inaccessible
2020-06-24 09:15:39 +02:00
Jake Dallimore 44b19c47bf Merge branch 'MDL-68992-38_france_digital_age' of https://github.com/martignoni/moodle into MOODLE_38_STABLE 2020-06-24 09:40:52 +08:00
Eloy Lafuente (stronk7) 81b393a717 Merge branch 'MDL-66568-38-2' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-06-23 17:57:33 +02:00
Nicolas Martignoni 6fb0f6f941 MDL-68992 Privacy: Update default minimal digital age of consent
Updating default minimal digital age of consent according to current legislation,
that was updated for several countries since 2018.
2020-06-23 12:23:36 +02:00
Jake Dallimore 4d26e345d0 Merge branch 'MDL-69021-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-06-23 11:31:48 +08:00
Adrian Greeve 1c8b779f27 Merge branch 'MDL-68841-3.8.3' of https://github.com/DinhHien0307/moodle into MOODLE_38_STABLE 2020-06-23 09:50:54 +08:00
Bas Brands a4099f2932 MDL-69021 theme_boost: improve link styles in alerts
- provide default styles for links in alerts if the .alert-link
css class is omitted.
2020-06-22 16:51:03 +02:00
Adrian Greeve 2557a7f8ff Merge branch 'MDL-69077_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-06-22 10:42:49 +08:00
AMOS bot 9518c81ab8 Automatically generated installer lang files 2020-06-21 00:07:28 +00:00
Sara Arjona befe7cce8d Merge branch 'MDL-69008-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-06-19 16:49:29 +02:00
Andrew Nicols 2dc698fb17 MDL-69086 theme_boost: Improve pendingJs checks for bootstrap
Where an element, like an `alert`, is closed it is removed from the DOM
before the event fires (this is a correct behaviour).

This means that the final event confirming that the action happened
(i.e. close => closed) fires, but does not bubble up the DOM to the
document.body.

This change moves the end event listener to only be added after a start
event has been fired, and to attach directly to the HTMLElement where it
will be fired. This means that the Event handler will still be called,
even though it has been removed from the DOM, because it does not need
to bubble up to the body.
2020-06-19 08:17:45 +08:00
Sara Arjona 898415efec weekly release 3.8.3+ 2020-06-18 14:13:55 +02:00
Sara Arjona 5b5233321e Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-06-18 14:13:53 +02:00
Victor Deniz Falcon 4d4ad0fe60 Merge branch 'MDL-66899-log-quiz-regrade_38' of https://github.com/rboyatt/moodle into MOODLE_38_STABLE 2020-06-18 04:55:12 +01:00
Tim Hunt 8fcb1b459d MDL-69077 questions: question tag capabilties are relevant 2020-06-17 13:07:45 +01:00
Jun Pataleta 8816107de4 Merge branch 'MDL-68890-3.8.3' of https://github.com/DinhHien0307/moodle into MOODLE_38_STABLE 2020-06-17 19:54:19 +08:00
Jun Pataleta 42cf09b5b4 MDL-69008 core: Fix accessibility issues in paged content templates
* Added menuitem role for the "Show x per page" menu.
* Added appropriate aria-labels for the links in the paging bar.
2020-06-17 15:59:57 +08:00
Jake Dallimore 408c793ed7 Merge branch 'MDL-68215-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-06-17 14:59:02 +08:00
Jun Pataleta 6324b63372 Merge branch 'MDL-68971_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-06-17 11:35:01 +08:00
Jun Pataleta 3c91dc0784 Merge branch 'MDL-67294-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-17 10:34:06 +08:00
Andrew Nicols 4d3658f7d8 MDL-66568 behat: Reset theme CSS between scenarios 2020-06-17 07:51:47 +08:00
Andrew Nicols bcbc91091c MDL-66568 behat: Support building of themes for behat 2020-06-17 07:51:47 +08:00
Andrew Nicols d57acc9d80 MDL-66568 core_output: Return built theme CSS 2020-06-17 07:51:47 +08:00
Mihail Geshoski bc125390bb MDL-67294 assignsubmission_file: Make sure record exists before updating 2020-06-17 00:55:57 +08:00
Víctor Déniz Falcón f097a1a20f Merge branch 'MDL-69049-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-06-16 17:52:32 +01:00
Jun Pataleta adc032b170 Merge branch 'MDL-68436_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-06-16 14:39:02 +08:00
Jun Pataleta 6c8f7e1ce2 MDL-69049 tool_dataprivacy: Add possibly missing comment format columns
The earlier CONTRIB plugin versions of the tool (<33.2.0, <34.2.0) were
missing the following columns in the data requests table:
* commentsformat
* dpocommentformat
And the upgrade scripts for the merged tool failed in
Moodle 3.3.8+/3.3.0+ failed to add these columns.
So a site which uses the CONTRIB plugin and eventually upgrading to 3.9
will encounter an error during upgrade because of the missing
dpocommentformat column.
2020-06-15 23:42:10 +08:00
Luca Bösch 8cb7cb1fdc MDL-68215 block_activity_result: Format elements more nicely. 2020-06-15 15:25:28 +02:00
hiendinh 5f6ce419c4 MDL-68890 progressbar: prevent display exist file's progress bar 2020-06-15 10:53:12 +07:00
AMOS bot 74235813b3 Automatically generated installer lang files 2020-06-14 00:07:26 +00:00
Sara Arjona 409baab766 weekly release 3.8.3+ 2020-06-11 18:03:58 +02:00
Andrew Nicols ee884c9728 Merge branch 'MDL-69006-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-06-11 13:05:39 +08:00
Andrew Nicols c6a9898ed0 Merge branch 'MDL-69002-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-06-11 11:21:16 +08:00
Adrian Greeve 80c3dcb8bf MDL-66601 atto_image: Remove bad build files. 2020-06-11 10:48:36 +08:00
Adrian Greeve 3c142d923f Merge branch 'MDL-66601-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-11 09:55:51 +08:00
Eloy Lafuente (stronk7) 53e4c04237 Merge branch 'MDL-68954-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-11 00:10:28 +02:00
Bas Brands 8cf375b627 MDL-69006 repository_flickr: flickr authentication fails
- Flickr does not like useragents including the word "Bot"
2020-06-10 15:56:27 +02:00
Tim Hunt 5e7c083dba MDL-68436 atto_recordrtc: only works once per page 2020-06-10 13:48:12 +01:00
Sara Arjona 7d896212f2 MDL-69002 core_badges: move backpack validation to a separate page
Instead of running the site backpack validation every time badges/backpacks.php
page is loaded, an action button has been added to the backpacks with OB set
to 2.0 to let admins running manually this verification when needed.
2020-06-10 13:01:29 +02:00
Sara Arjona 3a6950ccd7 MDL-69002 core_badges: add methods to support backpack validation
A more generic method has been added to the API to validate the
backpack connection (for now, there was only one method for
validating current backpack).
Besides, a renderer has been added to display this information
depending on the backpackid.
2020-06-10 12:45:14 +02:00
Sara Arjona 24562c031c MDL-69002 core_badges: remove site backpack verification from settings
This site backpack verification is not required so, instead of
running it always here, it will be moved to a separate page to let
admins decide when to check it.
2020-06-10 12:42:03 +02:00
Mihail Geshoski deca8028d9 MDL-66601 atto_image: Set the max-height of the image selection dialogue 2020-06-10 12:21:21 +08:00
Jun Pataleta 3063e8415a Merge branch 'MDL-68864-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-06-10 11:26:21 +08:00
Jun Pataleta ccbe61ee98 MDL-68864 qtype_multichoice: Rebuild clearchoice source map 2020-06-10 11:21:00 +08:00
Bas Brands ef874ad928 MDL-68864 qtype_multichoice: shift focus to first option on keyboard tab
- This prevents losing focus when using keyboard navigation
2020-06-10 11:15:17 +08:00
Bas Brands 9a33db6bea MDL-68864 qtype_multichoice: clearchoice
- Reverted changes from MDL-67901
2020-06-10 11:15:17 +08:00
Jake Dallimore b51501b403 Merge branch 'MDL-68972-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-06-10 09:16:08 +08:00
Jake Dallimore 4f142bccce Merge branch 'MDL-68995-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-06-10 08:53:55 +08:00
Helen Foster dac9cc3139 MDL-68972 lang: Import fixed English strings (en_fix) 2020-06-09 21:08:54 +02:00
Paul Holden 281c882327 MDL-68995 atto_image: remove initial dialogue image src attribute.
It caused a spurious request to be sent to the server on display.
2020-06-09 15:47:55 +01:00
Sara Arjona bbc79e490a weekly release 3.8.3+ 2020-06-09 12:14:38 +02:00
Tim Hunt 666365e46b MDL-68971 webservice: errors should give enough info to find the problem 2020-06-09 11:09:45 +01:00
Russell Boyatt 28509546d3 MDL-66899 quiz: Log a regrading event when quiz attempt is regraded. 2020-06-09 10:08:24 +01:00
Russell Boyatt a860a76a68 MDL-66899 quiz: Adding test for regrading quiz event. 2020-06-09 10:08:03 +01:00
Mihail Geshoski 8d650d9a01 MDL-68954 repository_flickr_public: Return only photo media 2020-06-09 12:37:35 +08:00
Mihail Geshoski bbaab1109e MDL-68954 repository_flickr_public: Handle when photo cannot be found 2020-06-09 12:37:34 +08:00
Jake Dallimore c8a07a5b68 Merge branch 'MDL-68929-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-08 11:11:00 +08:00
Andrew Nicols abb076ebbd Merge branch 'MDL-68899-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-08 10:29:27 +08:00
Mihail Geshoski 56d6a5d731 MDL-68899 theme_classic: Fix dashboard course cards rendering
Co-authored-by: Bas Brands <bas@moodle.com>
2020-06-08 09:16:00 +08:00
Mihail Geshoski 59417f0b1d MDL-68929 core_filepicker: Fix radio button alignment 2020-06-07 11:40:47 +08:00
Eloy Lafuente (stronk7) 4180fe0f42 weekly release 3.8.3+ 2020-06-06 18:12:56 +02:00
Eloy Lafuente (stronk7) 8a53b489bb Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-06-06 18:12:52 +02:00
AMOS bot fecb0dcceb Automatically generated installer lang files 2020-06-06 00:07:27 +00:00
Sara Arjona 2b0ae390d7 MDL-68704 h5plib_v124: upgrade JQuery version to 1.12.4 2020-06-05 19:47:49 +01:00
Eloy Lafuente (stronk7) 1f274f5032 Merge branch 'MDL-68888-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-06-05 19:23:07 +02:00
Sara Arjona 6f0115e399 weekly release 3.8.3+ 2020-06-05 13:24:16 +02:00
Helen Foster 4369ef0304 MDL-68888 lang: Import fixed English strings (en_fix) 2020-06-05 09:35:38 +02:00
Adrian Greeve fe3d7cdbaa Merge branch 'MDL-67773' of https://github.com/radzisze/moodle into MOODLE_38_STABLE 2020-06-05 11:48:52 +08:00
Anthony Radziszewski c852856ba7 MDL-67773 course: Make sure tags are enabled before logging the setting. 2020-06-04 11:43:01 -06:00
Adrian Greeve 019420fd11 Merge branch 'MDL-68203-decode-url-quiz-restore-MOODLE_38_STABLE' of https://github.com/ilya-catalyst/moodle into MOODLE_38_STABLE 2020-06-04 08:31:50 +08:00
Sara Arjona c2263f903d Merge branch 'MDL-68772-38' of https://github.com/Clyxz/moodle into MOODLE_38_STABLE 2020-06-03 13:18:00 +02:00
Jake Dallimore 719333e0ec Merge branch 'MDL-68875_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-06-03 12:29:08 +08:00
Andrew Nicols 3a98b992e9 Merge branch 'MDL-68312-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-06-03 08:09:41 +08:00
Martin Hanusch 27a12aba40 MDL-68772 mod_quiz: Navigation overlay fix 2020-06-02 16:53:33 +02:00
Eloy Lafuente (stronk7) b529ffad65 MDL-68875 privacy: Keep moodle_content_writer->get_path() the same
In MDL-62853 a new clean_param(PARAM_PATH) was added to the
moodle_content_writer->get_path() method. And this caused some
Windows tests to start failing.

The problem is that clean_param(PARAM_PATH) does normalise directory
separators to be always forward backslashes and that's normally ok
but the get_path() method has some DIRECTORY_SEPARATOR dependent code
that stopped working under windows.

After analysing various solutions, and trying to keep the behavior
EXACTLY like it was before MDL-62853, but with the cleaning included
we have applied 2 changes:

b) Move the clean_param() to later within the array_map() function,
that way the code there, that uses DIRECTORY_SEPARATOR will continue
working the same.

b) As far as there are more DIRECTORY_SEPARATOR dependent code later
in the function, also perform a str_replace() to convert back to the
OS directory separator.

Those 2 points together (a and b) make the behavior to be 100% the
original one, with separators being kept and the paths being cleaned.

This solution corresponds 100% with the proposed fixes named 3) and
4) in the issue.

Final note... all that DIRECTORY_SEPARATOR maybe needs a review because
it really shouldn't be used unless strictly needed. But that falls out
from this issue which goal was to keep things safely working like they
were before the regression (but with the cleaning applied).
2020-06-02 15:53:45 +02:00
Sara Arjona b5b8b1a486 weekly release 3.8.3+ 2020-06-02 13:03:13 +02:00
Sara Arjona 2f360b90c5 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-06-02 13:03:11 +02:00
Adrian Greeve efa47a2ba5 Merge branch 'MDL-68828-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-06-02 09:32:33 +08:00
Andrew Nicols 4b47df0236 Merge branch 'MDL-67518_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-06-02 09:20:19 +08:00
Adrian Greeve d9fe693347 Merge branch 'MDL-68723-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-06-02 08:58:37 +08:00
Eloy Lafuente (stronk7) 74206f3d78 Merge branch 'MDL-63284-38' of https://github.com/Clyxz/moodle into MOODLE_38_STABLE 2020-06-02 00:25:17 +02:00
Eloy Lafuente (stronk7) 0fce71647f Merge branch 'MDL-68866-38' of https://github.com/mchurchward/moodle into MOODLE_38_STABLE 2020-06-02 00:14:42 +02:00
Eloy Lafuente (stronk7) 3d50844c9f Merge branch 'MDL-68844-38' of https://github.com/roland04/moodle into MOODLE_38_STABLE 2020-06-02 00:09:48 +02:00
Mike Churchward 661c7a1988 MDL-68866 accesslib: Fixing parameter documentation. 2020-06-01 13:42:16 -04:00
Víctor Déniz Falcón f8f58c441b Merge branch 'MDL-68353-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-06-01 16:52:24 +01:00
Shamim Rezaie cdb0af69e1 MDL-68353 theme_classic: Update filepicker xpath selector 2020-06-01 03:45:32 +10:00
AMOS bot 85da65606b Automatically generated installer lang files 2020-05-30 00:07:22 +00:00
Martin Hanusch 6e64255df2 MDL-63284 question: Moving questions with tags disabled bug fix 2020-05-29 16:39:32 +02:00
Eloy Lafuente (stronk7) ec602d2f26 MDL-67518 phpunit: avoid DB sorting randomness in test
While reading from mdl_config, sometimes this test was failing
because an order was being presumed. Now we convert the records
array to an associative one to perform tests against it.
2020-05-29 16:26:07 +02:00
Jun Pataleta 6079a72373 Merge branch 'MDL-68353-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-05-29 22:25:54 +08:00
Sara Arjona 111fc893da weekly release 3.8.3+ 2020-05-29 12:52:30 +02:00
Sara Arjona 5d7f88d98b Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-29 12:52:27 +02:00
Mikel Martín 3eb69a0a9e MDL-68844 formslib: Fix inline layout for static elements 2020-05-29 11:11:40 +02:00
Shamim Rezaie 465c6e7c45 MDL-68353 test: Update existing tests to work with file elements 2020-05-29 14:51:58 +10:00
Shamim Rezaie 46323748fa MDL-68353 test: Update filemanager/filepicker xpath selector 2020-05-29 14:51:58 +10:00
Shamim Rezaie 32d28f8fac MDL-68353 test: get_field_locator to support custom field labels 2020-05-29 14:51:58 +10:00
Shamim Rezaie 2591f4ce79 MDL-68353 form: filepicker label fix 2020-05-29 14:51:54 +10:00
Shamim Rezaie c3764823cd MDL-68353 admin: Not use label tag in admin setting elements when needed 2020-05-29 14:35:46 +10:00
Shamim Rezaie 49e32e25ff MDL-68353 message: enclose privacy settings within a fieldset 2020-05-29 14:35:46 +10:00
Shamim Rezaie 46962930f7 MDL-68353 core: replace invalid labels with div 2020-05-29 14:35:46 +10:00
Shamim Rezaie 4c97f30360 MDL-68353 form: filemanager label fix 2020-05-29 14:35:43 +10:00
Jun Pataleta 35282e4d1a Merge branch 'MDL-64175-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-05-29 12:01:58 +08:00
Shamim Rezaie 78f4960bce MDL-68353 form: Only include the size attribute if there is a size set 2020-05-29 13:52:39 +10:00
Shamim Rezaie 6fa2f55cd0 MDL-68353 form: Removed the size attribute
The size attribute does not work with the checkbox input type.
2020-05-29 13:52:39 +10:00
Shamim Rezaie d3756efc83 MDL-68353 core: do not output empty labels 2020-05-29 13:52:38 +10:00
Shamim Rezaie 261804e95c MDL-68353 core: Set aria-label for close buttons on YUI dialogues 2020-05-29 13:52:36 +10:00
Mihail Geshoski 53c46ffb2e MDL-68723 filepicker: Display parent content in filemanger tree view 2020-05-29 11:46:32 +08:00
AMOS bot 7ba5f4896e Automatically generated installer lang files 2020-05-29 00:07:50 +00:00
Sara Arjona 3a76c07806 MDL-64175 atto_media: update advanced settings
Some OS, such as Ubuntu, are slightly changing the audio attributes,
from <audio attribute1="true"> to <audio attribute1>.
This patch is for reviewing this piece of code and covering both cases.
2020-05-28 17:27:16 +02:00
Eloy Lafuente (stronk7) 1794636ee6 Merge branch 'MDL-68753-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-05-28 13:02:29 +02:00
Sara Arjona 24906971d7 Merge branch 'MDL-68244-38' of https://github.com/Chocolate-lightning/moodle into MOODLE_38_STABLE 2020-05-28 12:42:50 +02:00
Sara Arjona 1ac59631d8 Merge branch 'MDL-68565-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-28 12:00:32 +02:00
hiendinh 4a77582d16 MDL-68841 Modal dialogs: Wrong behavior of popup 2020-05-28 16:33:11 +07:00
Eloy Lafuente (stronk7) 2140fe5549 Merge branch 'MDL-68789-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE 2020-05-28 10:47:06 +02:00
Pau Ferrer Ocaña fc13b8c1a0 MDL-68789 behat: Rename the app from Moodle Mobile to Moodle app 2020-05-28 08:40:54 +02:00
Jake Dallimore f4163d2748 Merge branch 'MDL-67903-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-28 13:59:13 +08:00
Adrian Greeve a90af06899 Merge branch 'MDL-68847-38' of https://github.com/snake/moodle into MOODLE_38_STABLE 2020-05-28 12:01:42 +08:00
Jake Dallimore 81e276c743 Merge branch 'mdl-68425-m38' of https://github.com/deraadt/moodle into MOODLE_38_STABLE 2020-05-28 11:24:07 +08:00
Jake Dallimore 45da2ac9d3 MDL-68847 mod_url: fix bug when using dnd to handle urls
This generates a notice, which wasn't seen because the feature works
asynchronously.
2020-05-28 09:32:34 +08:00
Andrew Nicols 8c83815ab1 Merge branch 'MDL-68846_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-05-28 07:35:59 +08:00
Paul Holden e34877300c MDL-68565 tool_usertours: account for optional config in WS response. 2020-05-27 22:10:56 +01:00
Eloy Lafuente (stronk7) e917a595b2 MDL-68846 behat: Avoid asserting AM/PM strings. They are not cross-os
The exists/contains steps of behat are case-sensitive, in the other
side, depending of the OS and locales, time functions are not 100%
consistent. See https://bugs.php.net/bug.php?id=76378 for example.

So only solutions are:

1) Create a specific new step performing the checks case insensitively.
2) Avoid making AM / PM part of the checks.

Here we have opted by the 2nd approach, it's not critical part to check.
2020-05-27 18:05:07 +02:00
Thomas.Ludwig 852cda447f MDL-67903 core_grades: remove outdated CSS for grade import form 2020-05-27 16:02:11 +02:00
Sara Arjona 9e2cb2075c Merge branch 'MDL-68343-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-05-27 15:09:52 +02:00
Sara Arjona 13b26170b9 Merge branch 'MDL-68667-38' of git://github.com/aanabit/moodle into MOODLE_38_STABLE 2020-05-27 12:27:00 +02:00
Jake Dallimore 6f792b5ed8 Merge branch 'MDL-52138-38-take4' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-05-27 14:25:52 +08:00
Andrew Nicols 1612572a62 Merge branch 'MDL-68765-M38' of https://github.com/ised-isde-canada/moodle into MOODLE_38_STABLE 2020-05-27 12:50:13 +08:00
Andrew Nicols 5c5b0ee137 Merge branch 'm38_MDL-68054' of https://github.com/danmarsden/moodle into MOODLE_38_STABLE 2020-05-27 12:14:12 +08:00
Jun Pataleta 582e43bebe Merge branch 'MDL-68750-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-27 11:04:04 +08:00
Andrew Nicols 2ea2d6a72f MDL-68750 tool_dataprivacy: Correct behat test modal checks 2020-05-27 10:40:30 +08:00
Ilya Tregubov 37d7820816 MDL-68203 restore: Decode quiz links when restore into existing course
or duplicating.
2020-05-27 10:39:49 +10:00
Eloy Lafuente (stronk7) fc2c76e78e Merge branch 'MDL-68789-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE 2020-05-26 23:42:56 +02:00
Luca Bösch 4c5684135a MDL-52138 core_grades: gradebook striped styling 2020-05-26 23:32:22 +02:00
Eloy Lafuente (stronk7) 35dd608161 weekly release 3.8.3+ 2020-05-26 22:52:25 +02:00
Sara Arjona 9faa136ca0 Merge branch 'MDL-68388_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-05-26 20:03:45 +02:00
Helen Foster 667d004a17 MDL-68753 lang: Import fixed English strings (en_fix) 2020-05-26 19:15:48 +02:00
Eloy Lafuente (stronk7) 640838c117 MDL-68388 core_grades: Tweak unit test assertion to make Oracle happy
Also modify some comments and get rid of some void return types.
2020-05-26 19:02:12 +02:00
Bas Brands f4a77e8381 MDL-68828 theme_classic: fix for mobile
- setting a max width so the page does not overflow its container on
mobile
- fixing dashboard cards to be 100% wide on mobile
2020-05-26 14:13:44 +02:00
Andrew Nicols 833d8bceb8 MDL-68750 analytics: Correct behat test modal checks 2020-05-26 12:56:25 +08:00
Andrew Nicols bc010acae0 MDL-68750 core_tag: Add missing confirmation dialogue title 2020-05-26 12:56:25 +08:00
Andrew Nicols 0deabbfbfd MDL-68750 behat: Correct dialogue selector 2020-05-26 12:56:25 +08:00
Andrew Nicols 404288d3bc Merge branch 'MDL-68099-38' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2020-05-26 11:38:32 +08:00
deraadt b16b681a79 MDL-68425 user: Add capability check for messaging 2020-05-26 13:01:06 +10:00
Andrew Nicols 14cfb3dcbf MDL-68388 grade: Tidy comments and whitespace 2020-05-26 10:19:09 +08:00
Andrew Nicols 074bdceb1f Merge branch 'M3.8-MDL-68388' of https://github.com/marcusboon/moodle into MOODLE_38_STABLE 2020-05-26 10:16:35 +08:00
Andrew Nicols c7545dc852 Merge branch 'MDL-64427-m38' of https://github.com/NeillM/moodle into MOODLE_38_STABLE 2020-05-26 10:05:58 +08:00
Andrew Nicols cd1a39717a Merge branch 'MDL-68270-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-26 08:03:06 +08:00
Victor Deniz Falcon c933e28af6 Merge branch 'MDL-68252_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-26 00:56:32 +01:00
Marcus Boon 0b62a26225 MDL-68388 core_grades: Use MUC for grade letters
In the get_grade_letters there is a static variable that is used
to cache grade letters, we should use MUC for this so that it is
reset properly between unit tests.
2020-05-26 09:27:05 +10:00
Bas Brands 8a977030fc MDL-68270 core_output: prevent blurring of navbar logo 2020-05-25 15:49:19 +02:00
Pau Ferrer Ocaña 0ff1309b3a MDL-68789 behat: Change app page menu text selector 2020-05-25 14:55:52 +02:00
Andrew Nicols 26badfdd1a Merge branch 'MDL-68103-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-25 19:55:33 +08:00
Bas Brands 1dafe5fbe5 MDL-68103 theme_classic: show content full width when printing 2020-05-25 13:49:39 +02:00
Nick Phillips f8621e3d58 MDL-68103 theme_classic: hidden-print => d-print-none for BS4. 2020-05-25 13:49:39 +02:00
Amaia Anabitarte e48b197957 MDL-68667 filepicker: Use shortitle parameter 2020-05-25 13:36:56 +02:00
Mathew May 7045cd8e67 MDL-68244 auth_email: Update unit test, remove hard assertion 2020-05-25 16:39:05 +08:00
Adrian Greeve 48583d2740 Merge branch 'MDL-68629_38' of https://github.com/t-schroeder/moodle into MOODLE_38_STABLE 2020-05-25 16:16:44 +08:00
Jake Dallimore 4ad9de59ea Merge branch 'MDL-62853-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-25 16:12:17 +08:00
Andrew Nicols b22accf82b Merge branch 'MDL-68658_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-05-25 15:26:36 +08:00
Adrian Greeve 99f948b4df Merge branch 'MDL-63812_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-25 14:42:08 +08:00
Ruslan Kabalin e94499f9b3 MDL-68592 formslib: Fix inline layout for nested groups 2020-05-22 17:55:50 +02:00
Eloy Lafuente (stronk7) 4e60865e2c MDL-68658 phpunit: Ensure that the configured proxy is applied always
Previously, if the RSS feed (extests) was being served locally,
CFG->proxybypass was applied and causing the test to fail (proxy
ignored).

In that exact test we need the configured proxy to be applied
always, because the test is exaclty about detecting the problem
when a wrong proxy is used.
2020-05-22 17:07:10 +02:00
Pau Ferrer Ocaña 43268a6a1c MDL-68789 behat: Adapt login step to new app version 2020-05-22 16:45:23 +02:00
Victor Deniz Falcon 38cc6d1071 weekly release 3.8.3+ 2020-05-22 14:21:47 +01:00
Victor Deniz Falcon 92ba52e21d Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-22 14:21:42 +01:00
Andrew Nicols 13215b2415 Merge branch '68137-moodle38-prevent-removing-all-dots-in-filename' of https://github.com/DSI-Universite-Rennes2/moodle into MOODLE_38_STABLE 2020-05-22 11:55:20 +08:00
Andrew Nicols 0b464b93d8 Merge branch 'MDL-57240_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-22 11:48:35 +08:00
Andrew Nicols e3b6ebadcc Merge branch 'MDL-68783-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-05-22 11:24:16 +08:00
Andrew Nicols 6944da3315 Merge branch 'MDL-67700-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2020-05-22 10:51:47 +08:00
David Mudrák e67a6060e0 MDL-68738 wiki: Prevent URLs inside links from turning into another link
There was a problem with wiki pages in the HTML markup syntax. If they
contain a link and the link text has a URL in it, that URL was converted
into another link. But it was not correctly nested and it caused
additional troubles with filters (particularly the multimedia filter if
the URL was a video such as on youtube).

The solution here is similar to what we do in filters. We protect the
whole explicit link so that its content is not further parsed. That
prevents the inner URL to be converted into another link and the
explicit link has the full control.
2020-05-21 21:12:42 +02:00
Sara Arjona 0aadca7a48 Merge branch 'm38_MDL-67497' of https://github.com/danmarsden/moodle into MOODLE_38_STABLE 2020-05-21 19:01:45 +02:00
Ferran Recio 0efd87b0f2 MDL-67700 message: prevent async loading conversation message mix 2020-05-21 18:04:31 +02:00
Sara Arjona d42ad4800d Merge branch 'MDL-66471-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-21 17:33:33 +02:00
Sara Arjona 19ebf2dc92 Merge branch 'MDL-67126_38' of https://github.com/ffhs/moodle into MOODLE_38_STABLE 2020-05-21 13:35:18 +02:00
Adrian Greeve a644c50920 Merge branch 'MDL-68733_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-21 08:36:23 +08:00
AMOS bot de19504712 Automatically generated installer lang files 2020-05-21 00:07:22 +00:00
Eloy Lafuente (stronk7) ff5773d511 Merge branch 'MDL-52578-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-05-21 00:57:22 +02:00
Michael Milette 314e9a4064 MDL-68765 auth: Login form has DIV tag with 2 CLASS attributes. 2020-05-20 14:07:37 -04:00
Neill Magill 2f5490410e MDL-64427 course: Mark activities during course contents deletion
When we want to delete all of the activities in a course we should
mark them as having a deletion in progress, as this makes them
unavailable to users immediately.

This should make it much less likely that a request to get a context
that does not exist should be made when a user accesses a page.
2020-05-20 08:30:05 +01:00
Neill Magill 34f176586b MDL-64427 course: Do not allow dirty cm_info during course delete
When deleting a course (especially one containing a large amount of
data) the course mod info cache could contain entries for deleted
activities for a signifcant amount of time making it possible that
users could see errors in Moodle.
2020-05-20 08:30:04 +01:00
Neill Magill 7a168c3beb MDL-64427 category: Stop error when another user deleting courses
If you try to visit a category where another user is deleting a
course the coursecat cache may not be fresh. This is because there
is a breif time where the course record will have been deleted,
while it is deleting other course information, before the event that
triggers the coursecat cache to be purged is fired.
2020-05-20 08:30:04 +01:00
Neill Magill 0be9bb13c7 MDL-64427 category: Test getting category courses during deletion
Adding a unit test for the situation where a course is partially
deleted when a list of courses in a category is retrived.
2020-05-20 08:30:04 +01:00
Jun Pataleta 55dde65d11 MDL-68783 core_grades: Fix outcome page's add/remove button styles
* Applied proper styles of btn-secondary.
* Added some vertical spacing between the buttons by enclosing them in
divs with 'm-y-1' class instead of just a br tag.
2020-05-20 13:13:27 +08:00
Jun Pataleta 45978220ab MDL-52578 core_course: Peer review fixes
* Fetch parent category only when necessary.
* Fix outdated variable names in original patch.
* Fix variable scope for $outcomeexists.
2020-05-20 10:31:31 +08:00
Steve Bader e8e5f49883 MDL-52578 core_course: Activity weight set to 0 on creation 2020-05-20 10:31:31 +08:00
Dan Marsden efeef8d82d MDL-68054 lib: viewhiddenactivities should be set as captype:read 2020-05-20 14:03:02 +12:00
AMOS bot 9821d4d9a7 Automatically generated installer lang files 2020-05-20 00:07:31 +00:00
Paul Holden f138423971 MDL-66471 user: fix user_selector debug about extra identity fields. 2020-05-19 19:12:23 +01:00
Sara Arjona e6d212fc07 weekly release 3.8.3+ 2020-05-19 17:54:31 +02:00
Sara Arjona 1adda884fd Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-19 17:54:28 +02:00
Tim Hunt 4fae2c3001 MDL-68733 quiz editing: behat test for altering random question tags 2020-05-19 11:10:04 +01:00
Bence Molnar 3427a6ec76 MDL-68733 quiz editing: be more careful deleting random question tags 2020-05-19 11:10:04 +01:00
Tim Hunt ea5c0c6b61 MDL-68733 question behat: question tag generator and use in quiz test 2020-05-19 11:10:03 +01:00
Ferran Recio fcbc4ccee6 MDL-67700 message: correcting conversation timer reset 2020-05-19 09:58:17 +02:00
Jun Pataleta dd293c28e1 Merge branch 'MDL-68528-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-19 11:45:55 +08:00
Andrew Nicols 79c6d0a453 MDL-68528 js: Normalise core component for template strings 2020-05-19 11:37:55 +08:00
Andrew Nicols 1ac5b70c5a MDL-68528 js: Normalise empty component to "core" for string 2020-05-19 11:34:59 +08:00
AMOS bot 9b38e44dfb Automatically generated installer lang files 2020-05-19 00:07:24 +00:00
Sara Arjona 57382b0e5e Merge branch 'MDL-68760_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-18 20:33:19 +02:00
Sara Arjona 2d2e93c6c6 Merge branch 'MDL-68728-38-2' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-18 20:23:47 +02:00
Tim Hunt e23b038479 MDL-68760 timezones: add string for new timezone America/Nuuk 2020-05-18 17:32:13 +01:00
Tim Hunt a2defe29c4 MDL-68760 string tests: make test_timezone_lang_strings message helpful 2020-05-18 17:32:12 +01:00
Marina Glancy aecc9e7170 MDL-68099 gradereport_grader: prevent exception without groups 2020-05-18 15:19:05 +02:00
Andrew Nicols a30ff32351 Merge branch 'MDL-68503_38_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_38_STABLE 2020-05-18 20:31:28 +08:00
Sara Arjona 1b34fbb716 Merge branch 'MDL-68253-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-05-18 13:56:43 +02:00
Adrian Perez 69e2477f90 MDL-67126 assign: set completion state for all group members 2020-05-18 12:25:57 +02:00
Andrew Nicols bca7a73d14 MDL-68728 calendar: Pending promises for event summary 2020-05-18 13:32:42 +08:00
AMOS bot c27c7abb6b Automatically generated installer lang files 2020-05-18 00:07:46 +00:00
AMOS bot 82d46e5037 Automatically generated installer lang files 2020-05-17 00:07:17 +00:00
Luca Bösch 4853c245c5 MDL-68253 mod_book: Remove prev arrow on the firstmost page. 2020-05-15 12:17:52 +02:00
Eloy Lafuente (stronk7) 4d56bb43b3 weekly release 3.8.3+ 2020-05-15 11:07:01 +02:00
Andrew Nicols 0cbb91e4c0 Merge branch 'MDL-66917-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-15 10:55:05 +08:00
Eloy Lafuente (stronk7) 2ef16003f1 Merge branch 'MDL-68677-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-15 02:00:39 +02:00
Andrew Nicols 80787a98b3 MDL-68677 core: Correct usage of templaterev for caching templates
The M.cfg.templaterev variable should only be used to present persistent
caching, not caching of content within the same page load.

Preventing caching of same-page content makes it difficult to develop
for real user experiences as content is slow to load and does not give a
realistic and consistent loading experience.

This change affects the loading of partials specifically which notably
includes the loading spinner. Without this patch the loading icon is
often not seen at all because it does not load in a timely fashion and
the content being loaded is loaded first.
2020-05-15 07:55:59 +08:00
Eloy Lafuente (stronk7) 698f0cff54 Merge branch 'MDL-68084-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-15 01:30:52 +02:00
Sara Arjona 0e73dacaaf Merge branch 'MDL-68200-38-take2' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-05-14 13:12:50 +02:00
Jake Dallimore 2ba93cc439 Merge branch 'MDL-68631_38' of https://github.com/jonof/moodle into MOODLE_38_STABLE 2020-05-13 09:25:22 +08:00
Paul Holden cd0af947a7 MDL-68084 blocks: check capability before getting content.
Some blocks (e.g. Calendar) load additional JS modules when returning
content. We need to make sure they aren't asked to generate content
unless the user can actually view the block, or the expected content
required by the JS will not exist in the DOM and can cause exceptions.
2020-05-12 19:21:35 +01:00
Sara Arjona 9b2253898a weekly release 3.8.3+ 2020-05-12 14:16:49 +02:00
Shamim Rezaie a81508489d MDL-68200 core: Fix phpdoc for the external return functions 2020-05-12 15:07:23 +10:00
Shamim Rezaie 3ec67cf4bb MDL-68200 core: Fix datetime format
date.toISOString() prints out the seconds as well.
Current code supports most valid values for the datetime attribute
2020-05-12 15:07:23 +10:00
Shamim Rezaie 365bfab967 MDL-68200 mod_forum: fix invalid format of the time tag on modern view 2020-05-12 15:07:23 +10:00
Shamim Rezaie a8b4b9f407 MDL-68200 mod_forum: Fix the invalid date format in the time tags 2020-05-12 15:07:23 +10:00
Jun Pataleta c59656006b MDL-68200 mod_forum: Use core/time_element for the discussion list page 2020-05-12 15:05:04 +10:00
Jun Pataleta 84d550cacb MDL-68200 core: Add new time_element template 2020-05-12 15:05:04 +10:00
Jun Pataleta b238304072 MDL-68200 core: Support fixday/hour for core/user_date's get() method 2020-05-12 15:05:04 +10:00
Jun Pataleta 10127ac33d MDL-68200 core: Support fixday/hour for core_external::get_user_dates() 2020-05-12 15:05:04 +10:00
Shamim Rezaie 6a7350d44b MDL-68200 core: Add calendartype param to user_date.loadDatesFromServer 2020-05-12 15:05:03 +10:00
Shamim Rezaie ed19fe85e4 MDL-68200 core: Add type param to core_get_user_dates external function 2020-05-12 15:05:03 +10:00
Shamim Rezaie bd76f0bb66 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 15:02:05 +10:00
Shamim Rezaie c78ebc9586 MDL-68200 mod_forum: single discussion to follow nestet_v2 display rules 2020-05-12 15:02:05 +10:00
Shamim Rezaie d2886d283a MDL-68200 theme_boost: workaround for IE for flexbox not filling height
read more:
https://philipwalton.com/articles/normalizing-cross-browser-flexbox-bugs/
2020-05-12 15:02:05 +10:00
Eloy Lafuente (stronk7) 3ab743dcd9 Merge branch 'MDL-68579-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-05-11 23:14:10 +02:00
Brendan Heywood 6f0506fa9d MDL-68276 admin: Skip risky tables and columns in db_replace 2020-05-11 23:11:46 +02:00
Jun Pataleta 2faa47c934 Merge branch 'MDL-66109-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-12 00:03:10 +08:00
Mihail Geshoski 6c86327b33 MDL-68576 filepicker: Cover in behat file edition in filemanager
The added behat tests would also confirm whether the behaviour of
a click action on a file using different views in the filemanager
is consistent.
2020-05-11 16:35:09 +02:00
Mihail Geshoski 6619bdf99d MDL-68576 filepicker: Cover in behat file selection from filepicker
The added behat tests would cover the issue in MDL-68576. They test
whether the behaviour of a click action on a file using different
views in the filepicker is consistent.
2020-05-11 16:34:59 +02:00
cescobedo 74860627f2 MDL-68579 core_h5p: Add a check to avoid execute task using BEHAT 2020-05-11 10:15:01 +02:00
Andrew Nicols 738da05555 MDL-66109 js: Built file changes from new Node version 2020-05-11 10:53:49 +08:00
Andrew Nicols 9c07f29d8e MDL-66109 js: Fix circular dependency in Shifter dependency
Shifter is using an ancient and no-longer supported of Istanbul. That
version contains a circular dependency whereby it fetches the version
from the index that included the file in the first place.  This throws a
warning on newer versions of Node.

The fix here is simple and intended to be the bare minimum to remove
these warnings anad resolve the issue.

We have forked the istanbul project and created a v0.1.37_moodle branch
at the root version of the Istanbul version that Shifter uses (v0.1.37
tag). The circular dependency is then addressed and a new tag created.

I have then forked Shifter, pointing its package.json at the tar.gz
download of that new tag and pushed a new branch and tag for that fix.

Following this our own package.json is updated to point to the tar.gz
version of the new Shifter tag.
2020-05-11 10:53:48 +08:00
Andrew Nicols ed68a025ef MDL-66109 js: Upgrade to latest stable version of NodeJS
Version 14.0.0 has just been released as stable, and will make its way
to an LTS release which will be supported until 30th April 2023.

At time of writing it is the "Current stable" release and will remain in
this phase until 20th October 2020, at whciih point it will transition
to LTS status.
2020-05-11 10:53:48 +08:00
Eloy Lafuente (stronk7) 5afef2670e Moodle release 3.8.3 2020-05-09 20:05:41 +02:00
Eloy Lafuente (stronk7) fda378562d weekly release 3.8.2+ 2020-05-08 13:30:01 +02:00
Eloy Lafuente (stronk7) 5edc307f7a Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-08 13:29:59 +02:00
Jake Dallimore 8f17c2f11c Merge branch 'MDL-51694-38' of https://github.com/MartinGauk/moodle into MOODLE_38_STABLE 2020-05-08 11:22:55 +08:00
Eloy Lafuente (stronk7) b8b889c7c9 Merge branch 'MDL-68443-xmldb-path-validation-MOODLE_38_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_38_STABLE 2020-05-07 19:16:54 +02:00
Paul Holden 2b188d2299 MDL-68415 core: test attachments in email_to_user from allowed paths. 2020-05-07 18:40:56 +02:00
fujiwara 926277865c MDL-68415 email: Fix attachment in email_to_user() 2020-05-07 18:40:49 +02:00
Tim Schroeder 1f59f848d7 MDL-68629 mod_choice: multilang coursename support 2020-05-07 15:47:53 +02:00
Jake Dallimore b6dfd9d89e Merge branch 'MDL-62403-38' of git://github.com/lameze/moodle into MOODLE_38_STABLE 2020-05-07 14:19:09 +08:00
Simey Lameze 837651249b MDL-62403 portfolio: add upgrade notes for google docs 2020-05-07 13:06:35 +08:00
Ryan Wyllie c4015ffff4 MDL-62403 portfolio: create directories for google drive export
I've modified the Google Drive portfolio export so that it creates a
root directory in Drive for all of the files in the export. This allows
each export to be contained from each other to help with clashing file
names.

Additionally, the paths for the exported files will now be created in
Drive so that exported files are in the correct directory structure.
This is important for forum posts exports which assume a certain
directory structure in the export.
2020-05-07 12:43:14 +08:00
Jun Pataleta 91d3e7a632 MDL-68355 gradingform_guide: Improve lang strings 2020-05-07 11:50:48 +08:00
Jonathon Fowler b9fc865245 MDL-68631 cron: ensure the cron user is reset between scheduled tasks 2020-05-07 13:26:51 +10:00
Andrew Nicols 0bda145eaa Merge branch 'MDL-68556-38-pluginscheckcss' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-05-07 09:14:01 +08:00
Paul Holden fadae3cfe9 MDL-68410 mod_scorm: safer status operator comparison. 2020-05-07 09:03:09 +08:00
Ferran Recio 8aa0b41e9b MDL-68430 filter_mathjaxloader: update default CDN to 2.7.8 2020-05-06 11:14:22 +02:00
Jun Pataleta e247ec921a Merge branch 'MDL-68402_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-06 17:04:35 +08:00
Tim Hunt 1673baf5dd MDL-68402 accesslib: fix coding style of loops 2020-05-06 09:59:55 +01:00
Tim Hunt 7172233782 MDL-68402 accesslib: Modernise coding style in the functions changed 2020-05-06 09:59:54 +01:00
Tim Hunt 4508f85b7b MDL-68402 accesslib: fix get_with_capability_join logic
In fact, rather than fix the old logic, I noticed that the correct
logic was already implemented in get_users_by_capability. So, I
refactored to extract the working version into a function, which it
turns out can have exactly the same API as get_with_capability_join,
which was convenient.
2020-05-06 09:59:54 +01:00
Jake Dallimore bd0a6a98b8 Merge branch 'MDL-68293-38' of git://github.com/jleyva/moodle into MOODLE_38_STABLE 2020-05-06 12:53:38 +08:00
Jun Pataleta 9ae897f9c9 Merge branch 'MDL-68301-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-06 10:32:49 +08:00
Andrew Nicols 02e93de9e1 Merge branch 'MDL-63609-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-05-06 08:51:48 +08:00
Jake Dallimore 1b8bed6664 Merge branch 'MDL-68355-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-05-06 08:36:26 +08:00
AMOS bot 41c21d354e Automatically generated installer lang files 2020-05-06 00:13:12 +00:00
Eloy Lafuente (stronk7) b3c89dafd3 weekly release 3.8.2+ 2020-05-05 19:05:42 +02:00
Eloy Lafuente (stronk7) 9504266620 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-05 19:05:39 +02:00
Bas Brands f1dbea7200 MDL-68266 core_message: disable custom switches for behat testing 2020-05-05 14:20:10 +02:00
Andrew Nicols 18aa8915f0 Merge branch 'MDL-67881-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-05 11:18:20 +08:00
Jun Pataleta 6f869765b8 Merge branch 'MDL-68266-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-05-05 09:20:46 +08:00
Bas Brands ab320de86d MDL-68266 theme_boost: behat enable custom switches 2020-05-05 09:12:14 +08:00
AMOS bot 871291264b Automatically generated installer lang files 2020-05-05 00:11:34 +00:00
Eloy Lafuente (stronk7) cfab3a6e6c Merge branch 'MDL-52904-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-05-04 22:32:16 +02:00
Martin Gauk b1345143ea MDL-51694 core_grades: use transactions when deleting 2020-05-04 12:48:10 +00:00
Sara Arjona 11e2fc4b0a Merge branch 'MDL-68315-MOODLE_38_STABLE' of https://github.com/kabalin/moodle into MOODLE_38_STABLE 2020-05-04 10:37:30 +02:00
Andrew Nicols 3cc76c335a Merge branch 'MDL-68266-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-05-04 15:33:33 +08:00
Bas Brands 5190632f6b MDL-68266 core_course: accessibility improvements for course managent
colour contrast improvements
use custom checkboxes
use accessible colour for text-muted
2020-05-04 09:12:15 +02:00
David Saylor 8a29ee1722 MDL-52904 completion: reference context in cron query
Co-authored-by: Barbara Lawrence <blawrence@harlow-college.ac.uk>
2020-05-04 09:58:06 +08:00
Jun Pataleta 2ddc2e8430 MDL-52904 completion: Unit tests for daily completion task 2020-05-04 09:58:06 +08:00
Andrew Nicols f6f68bd59f Merge branch 'MDL-66263_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-05-03 20:23:26 +08:00
Andrew Nicols f2e7e84f0e Merge branch 'MDL-68509-38' of https://github.com/Dagefoerde/moodle into MOODLE_38_STABLE 2020-05-03 19:54:49 +08:00
Eloy Lafuente (stronk7) 577e336927 MDL-66263 travis: Simple bump to php74
Also update a couple of places (mysql, node)
that were not runnig really on highest. Now they are.
2020-05-02 17:19:23 +02:00
Eloy Lafuente (stronk7) 69ae995d5c weekly release 3.8.2+ 2020-05-02 16:36:42 +02:00
Eloy Lafuente (stronk7) 2fba5aee43 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-05-02 16:36:38 +02:00
Andrew Nicols 2564088c4c Merge branch 'MDL-68492-m38' of https://github.com/sammarshallou/moodle into MOODLE_38_STABLE 2020-05-01 12:07:23 +08:00
Andrew Nicols 91d3dc31a6 Merge branch 'MOODLE_38_MDL-67540' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-05-01 11:21:16 +08:00
Andrew Nicols f0e452240e Merge branch 'MDL-57680_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-05-01 11:06:58 +08:00
Eloy Lafuente (stronk7) 01ee979b0e Merge branch 'MDL-68427-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-04-30 23:35:23 +02:00
Jun Pataleta d9245d6f87 Merge branch 'MDL-68404-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-04-30 13:32:57 +08:00
Jun Pataleta c9d9fb3ff7 Merge branch 'MDL-68309-38' of https://github.com/snake/moodle into MOODLE_38_STABLE 2020-04-30 09:57:37 +08:00
AMOS bot 3c67ae2c14 Automatically generated installer lang files 2020-04-30 00:11:57 +00:00
Eloy Lafuente (stronk7) 6fc1bf6646 Merge branch 'MDL-68434-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-04-29 22:52:51 +02:00
David Mudrák ece9b780d5 MDL-68434 lang: Use the updated terminology in the tests 2020-04-29 17:47:36 +02:00
David Mudrák 0bfb8c4d83 MDL-68556 admin: Fix some minor styling issues on the plugins check page
The patch fixes missing space around elements and some other minor
visual issues detected. This was a good opportunity to get rid of custom
CSS rules and use the native bootstrap classes and utilities.
2020-04-29 14:33:33 +02:00
Dan Marsden d95f185556 MDL-67497 lib: backuptargetimport should be set as captype:read 2020-04-29 08:14:45 +12:00
Helen Foster 53611ca744 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
2020-04-28 15:35:48 +02:00
Andrew Nicols a56ecac082 Merge branch 'MDL66035_38_STABLE' of https://github.com/jwalits/moodle into MOODLE_38_STABLE 2020-04-28 20:04:43 +08:00
Luca Bösch 8f15f3e753 MDL-68404 gradingform_rubric: Style "Add level" button. 2020-04-28 14:04:07 +02:00
Andrew Nicols 23cd7eb539 Merge branch 'MDL-68445_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-28 18:31:11 +08:00
Julien Boulen af9bf5f609 MDL-68137 core_files: replace consecutive dots in filename by single dot 2020-04-28 11:29:52 +02:00
Eloy Lafuente (stronk7) d946fcd870 weekly release 3.8.2+ 2020-04-28 11:15:30 +02:00
Eloy Lafuente (stronk7) 7a53f91feb Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-04-28 11:15:27 +02:00
Andrew Nicols 74b553af3e Merge branch 'MDL-68525-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-04-28 10:22:24 +02:00
Andrew Nicols 1cbf0b9513 Merge branch 'MDL-66259_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-28 10:22:21 +02:00
Andrew Nicols d75dd9318a Merge branch 'MDL-67316_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-28 10:22:18 +02:00
Andrew Nicols 6d9c9e24a4 Merge branch 'MDL-68047_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-28 10:22:15 +02:00
Eloy Lafuente (stronk7) 7d599aeea4 MDL-68525 behat: chrome/switches caps not allowed in Chrome > 81
Now we need to use extra_capabilities/chromeOptions/args instead

The former was deprecated long ago, it seems that Chrome 81 has
stopped accepting it. The later seems to be working at very least
since Chrome 76 (haven't gone further back).
2020-04-28 12:32:11 +08:00
Eloy Lafuente (stronk7) 65e1204528 Merge branch 'MDL-68393-38-availableupdateui' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-04-27 17:40:00 +02:00
Eloy Lafuente (stronk7) 055bd177fd Merge branch 'MDL-65967-38' of https://github.com/danielneis/moodle into MOODLE_38_STABLE 2020-04-27 17:31:29 +02:00
AMOS bot 0d4a715c46 Automatically generated installer lang files 2020-04-27 00:11:31 +00:00
Jwalit Shah 51c65d7bc5 MDL-66035 message: Restore missing message preferences files 2020-04-27 09:49:20 +10:00
Tim Hunt af64d73515 MDL-57680 form autocomplete: extend Behat tests 2020-04-26 15:11:52 +01:00
Tim Hunt 27e80b99b7 MDL-57680 form autocomplete: fix triggering change event 2020-04-26 14:21:19 +01:00
Tim Hunt 79542e4f11 MDL-57680 form autocomplete: let singleselects be cleared.
This was already working after ajax had refreshed the choices, it was just
broken on first page load.
2020-04-26 14:21:18 +01:00
Mikhail Golenkov a58cfea205 MDL-67540 quiz: Start transaction before selecting existing slots.
Co-authored-by: Conn <conn@cmrwarwicker.com>
2020-04-26 10:55:17 +10:00
Thiagolivramento 114d51f98b MDL-65967 tool_recyclebin: add recycle bin link to category edit menu 2020-04-24 17:08:33 -03:00
Eloy Lafuente (stronk7) 5ff9020fe3 MDL-68445 behat: Bump to 3.6.x
composer.lock generated with PHP 7.1, following:

https://docs.moodle.org/dev/Composer#How_to_prepare_and_submit_composer_changes

Also, ensure Symfony/Process > 4.0 compatibility
(needed for parallel runs)
2020-04-24 15:57:12 +02:00
Eloy Lafuente (stronk7) 92deb62243 MDL-67316 ldap: Pass correct hex chars to hexdec()
Before php74 they were silently discarded, now they
show a deprecation message.
2020-04-24 15:56:46 +02:00
Eloy Lafuente (stronk7) f769b8f4d0 MDL-67316 typo3: Pass correct hex chars to hexdec()
Typo3 was relaying on the feature of base converter
functions silently removing invalid chars so, for example:

'U+00A0' => '00A0' => 160

Since php74, the existence of those invalid chars do produce
a deprecation warning, no matter the outcome continues being the same.

So, here, we are just converting that invalud 'U+' by '0x'
2020-04-24 15:56:46 +02:00
Tim Hunt bc113f89cc MDL-66259 qtypes: Add missing comment on get_random_guess_score
A bit off-topic for this issue number, but I noticed it while
working on this, and though it was not worth creating a
separate MDL for.
2020-04-24 15:56:31 +02:00
Tim Hunt f18b531639 MDL-66259 qtype_numerical: remove no-longer relevant todo I noticed 2020-04-24 15:56:31 +02:00
Eloy Lafuente (stronk7) a18a00bd2d MDL-66259 qtypes: get_question_options() always call parent::
To get the question->options initialised, children must
call parent::get_question_options() always. Also, it is
just general good practice. Subclasses are meant to be
adaptations of the base class, not something completely
different.

Note, there are some changes in the data structure
produced (see changes in the tests) but these changes
are not wrong.
2020-04-24 15:56:31 +02:00
Tim Hunt d37c61365a MDL-66259 quiz responses: fix unrealistic test setup 2020-04-24 15:56:31 +02:00
Eloy Lafuente (stronk7) 15ffdf736a MDL-66259 qtype: add tests to all remaining involved qtypes
That way we get the load_question_data() method covered
and all the main data, options, hints checked.
2020-04-24 15:56:31 +02:00
Tim Hunt 42eae914f1 MDL-66259 qtype_truefalse: unit test of loading questions from the DB
This is about to be changes, so we need a test first to catch regressions.
2020-04-24 15:56:31 +02:00
sam marshall 6effee8992 MDL-68492 Behat: Use faster direct link steps in lib/tests/behat 2020-04-24 12:08:14 +01:00
sam marshall eeef704d40 MDL-68492 Behat: Direct URL links for courses, activities 2020-04-24 12:08:14 +01:00
Tim Hunt f42b67ab2c MDL-68252 question tags: fix tag editing for missingtype questions 2020-04-24 11:26:39 +01:00
Tim Hunt 088d4309fe MDL-68252 question bank: for 'missingtype' questions, hide actions 2020-04-24 11:26:38 +01:00
Shamim Rezaie 4281fe1070 MDL-68509 core_ddl: Keep databasemeta cache after dropping temptables
Backport of MDL-58584 (934c2ee + 94e2509)
2020-04-24 11:05:59 +02:00
Jun Pataleta a6f315c1e7 weekly release 3.8.2+ 2020-04-24 09:41:12 +08:00
Jun Pataleta 094b66ea85 NOBUG: Fixed file access permissions 2020-04-24 09:41:11 +08:00
Jun Pataleta 8af31de77b Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-04-24 09:41:10 +08:00
Mark Johnson a84620c2d5 MDL-68503 user profile: Make sortorders relative to existing records 2020-04-23 15:55:53 +01:00
Eloy Lafuente (stronk7) 6da6114778 Merge branch 'MDL-67886_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-23 16:06:26 +02:00
Tim Hunt 59afcdd850 MDL-63812 qtype_gapselect: fix questions with non-consecutive gap nos 2020-04-23 14:41:38 +01:00
Tim Hunt 69b0bbde10 MDL-63812 qtype_gapselect: test data generator to standard qtype pattern 2020-04-23 14:41:37 +01:00
Eloy Lafuente (stronk7) 656a05bef8 MDL-67886 phpunit: Make tests cross-db
The suggested SQL in some of the assertions was not cross-db
but db-dependent. Now we just keep that part out from the
assertions, because it's not important to verify the
errors that are being asserted.
2020-04-23 12:30:17 +02:00
Andrew Nicols 76223a290d MDL-68427 core: Correct previous/next page in paging bar 2020-04-23 12:49:06 +08:00
Jun Pataleta 801c9c2717 Merge branch 'MDL-68351_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-23 11:17:27 +08:00
AMOS bot fc2497fbc5 Automatically generated installer lang files 2020-04-23 00:14:37 +00:00
Eloy Lafuente (stronk7) 6c73d86264 Merge branch 'MDL-67886_38' of git://github.com/mdjnelson/moodle into MOODLE_38_STABLE 2020-04-23 01:37:10 +02:00
Mark Nelson 3aa10ddd4f MDL-67886 core: check_database_schema() checks for missing indexes 2020-04-22 23:19:16 +02:00
Tim Hunt 660fa2871a MDL-57240 quiz: don't show useless links on overdue attempt summary page 2020-04-22 21:38:52 +01:00
Jun Pataleta 81c011d388 Merge branch 'MDL-68392_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-22 11:09:35 +08:00
Shamim Rezaie 24d7375f0f MDL-68312 grade: Fix empty links
If a link contains no text, the function or purpose of the link will not
be presented to the user. This can introduce confusion for keyboard and
screen reader users.
2020-04-22 04:33:05 +10:00
Shamim Rezaie 71caffb7e0 MDL-68312 output: Fix empty links
If a link contains no text, the function or purpose of the link will not
be presented to the user. This can introduce confusion for keyboard and
screen reader users.
2020-04-22 04:33:04 +10:00
Shamim Rezaie 04e9010c92 MDL-68312 gradereport_grader: Remove adjacent links to the same URL 2020-04-22 04:33:04 +10:00
Shamim Rezaie 9912c37afd MDL-68312 gradereport_grader: replace invalid label by aria-describedby
The for attribute of the label element should not refer to a non-hidden
form control.
2020-04-22 04:33:04 +10:00
Shamim Rezaie d37757abf1 MDL-68312 gradereport_grader: Use caption instead of summary in table
The summary attribute on the table element is obsolete.
2020-04-22 04:33:04 +10:00
Shamim Rezaie f9b144d6bf MDL-68343 gradereport_singleview: Remove adjacent links to the same URL 2020-04-22 04:31:06 +10:00
Shamim Rezaie 85bf5b2e2c MDL-68343 gradereport_singleview: Use caption instead of summary
The summary attribute on the table element is obsolete.
2020-04-22 04:31:06 +10:00
Shamim Rezaie cc36c39b46 MDL-68343 gradereport_singleview: fix empty links 2020-04-22 04:31:06 +10:00
Shamim Rezaie 5d2be187a2 MDL-68343 gradereport_singleview: Only output label tag if label exists
This also fixes the issue of having multiple form labels for a single
element.
2020-04-22 04:31:06 +10:00
Shamim Rezaie 10bc73d5b6 MDL-68343 output: fix html table structure
A <th> that contains no text may result in cells with missing or
incorrect header information. WAVE advises that we should make a cell
a <td> rather than a <th> if the cell must remain empty (such as the
top-left cell in a data table).

Also note that the scope attribute is only valid for <th>
2020-04-22 04:31:06 +10:00
Paul Holden bde34b41f8 MDL-63609 media_videojs: support Youtube URL start time. 2020-04-21 14:45:53 +01:00
Paul Holden 80827f076c MDL-62853 privacy: sanitize subcontext paths. 2020-04-21 14:38:14 +01:00
Paul Holden 059f402a51 MDL-66917 admin: validate uploaded plugin version.
Prevent overwriting current plugins with older versions of themselves.
2020-04-21 14:36:18 +01:00
Jun Pataleta 9116fd6e97 Merge branch 'MDL-68356-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-04-21 09:25:10 +08:00
Jun Pataleta 06fe619327 Merge branch 'MDL-68339_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-20 21:52:49 +08:00
Bas Brands fe2fc1c79b MDL-67881 core_message: fix tab order for message drawer 2020-04-20 12:03:06 +02:00
AMOS bot 78939c0069 Automatically generated installer lang files 2020-04-19 00:13:19 +00:00
Brendan Heywood db94d504f7 MDL-68443 xmldb: Improve path validation on view_xml action 2020-04-18 20:50:41 +10:00
Andrew Nicols cba151a391 Merge branch 'MDL-67317_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-17 18:36:15 +08:00
cescobedo 00de69b59f MDL-68356 core_h5p: Fix h5p mimetype
Add a correct mime type for h5p files and update existing
mime type for stored h5p files.
2020-04-17 09:07:17 +02:00
AMOS bot 072050567a Automatically generated installer lang files 2020-04-17 00:16:18 +00:00
Eloy Lafuente (stronk7) 76b745e76a MDL-67317 behat: Bump to 3.38.4 moodle-behat-extension
It comes with behat/mink 1.8.x that provides php74 compatibility.

lock file generated with php71 (min version supported by the branch)
2020-04-16 20:28:56 +02:00
Eloy Lafuente (stronk7) cd93d0b9cf MDL-67317 behat: Ensure that on every scenario we have a session.
Before Mink 1.8.0, any call to getSession() used to auto-start
the session if it was not avaliable there. That always has been
an unsupported detail.

With https://github.com/minkphp/Mink/pull/705 new sessions aren't
auto-created anymore.

And we were relying on that.

So this is, simply about to explicitly create the new session
in our before_scenario stuff, to guarantee that it's always there.
2020-04-16 20:28:56 +02:00
Shamim Rezaie 11278ad7a3 MDL-68351 libraries: Update the upgrade instructions
Backport of MDL-67374
2020-04-16 20:28:41 +02:00
Shamim Rezaie d9c1feece4 MDL-68351 libraries: Upgrade SimplePie to version 1.5.3
Backport of MDL-67374
2020-04-16 20:28:41 +02:00
Eloy Lafuente (stronk7) 35bf8e5c25 MDL-68339 message: move array_key_exists() to property_exists()
Towards PHP 7.4 compliance:

array_key_exists(): Using array_key_exists() on objects is
deprecated. Use isset() or property_exists() instead
2020-04-16 20:28:30 +02:00
Eloy Lafuente (stronk7) 666cc20c30 weekly release 3.8.2+ 2020-04-16 19:34:28 +02:00
Eloy Lafuente (stronk7) e0fd39791c Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-04-16 19:34:23 +02:00
Juan Leyva dcc4bfa042 MDL-68293 mobile: Update language strings to mention new app plans
We need to update different language strings to let our site admins know about the new app restrictions
(for both features and user devices able to receive notifications)
2020-04-16 12:53:36 +02:00
Adrian Greeve d0323fb7c6 Merge branch 'MDL-68196-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-04-16 10:56:37 +08:00
Shamim Rezaie 0a9b84efff MDL-68196 core: not expand autocomplete elements too soon on IE 2020-04-16 12:19:00 +10:00
Eloy Lafuente (stronk7) f8c8576f63 Merge branch 'MDL-66849-M38' of https://github.com/ised-isde-canada/moodle into MOODLE_38_STABLE 2020-04-16 01:02:53 +02:00
Eloy Lafuente (stronk7) 14a4038810 Merge branch 'MDL-68323-38' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2020-04-16 00:53:58 +02:00
Eloy Lafuente (stronk7) d6347d8c3c Merge branch 'MDL-68279-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-04-16 00:33:19 +02:00
Eloy Lafuente (stronk7) 29dccc952c Merge branch 'MDL-68189-m38' of https://github.com/NeillM/moodle into MOODLE_38_STABLE 2020-04-16 00:13:42 +02:00
Eloy Lafuente (stronk7) 100c569431 Merge branch 'MDL-68280-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-04-16 00:10:48 +02:00
Sara Arjona b1c442ccc4 Merge branch 'MDL-67751-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-04-15 17:57:13 +02:00
Jun Pataleta e45c2fd424 Merge branch 'MDL-66200-MOODLE_38_STABLE_gradebook_csv_import' of https://github.com/jwalits/moodle into MOODLE_38_STABLE 2020-04-15 23:17:50 +08:00
Paul Holden 7ada02755d MDL-67751 course: include inline folders in list of resources. 2020-04-15 13:59:41 +01:00
Eloy Lafuente (stronk7) f7c1752fb3 Merge branch 'MDL-67499-38' of git://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-04-15 12:49:42 +02:00
Bas Brands 210794be38 MDL-68301 theme_boost: move course format css
this reduces duplication of css in format_topic
and format_weeks
2020-04-15 09:53:06 +02:00
Adrian Greeve 6278b8af59 Merge branch 'MDL-67663-38-3' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-04-15 13:23:12 +08:00
Michael Milette 9ff584a1e9 MDL-66849 output: Remove custom menu title when not specified 2020-04-14 22:24:13 -04:00
Jun Pataleta 194a801160 Merge branch 'MDL-68405-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-04-14 16:09:24 +08:00
Andrew Nicols 5af33db074 MDL-68405 js: Ensure correct exit code for gherkinlint 2020-04-14 15:09:48 +08:00
AMOS bot 052c43eec9 Automatically generated installer lang files 2020-04-11 00:11:54 +00:00
AMOS bot f43c324b0b Automatically generated installer lang files 2020-04-11 00:11:54 +00:00
David Mudrák 64bff8a106 MDL-68393 admin: Fix some minor styling issues on the notifications page
The patch makes the available update information elements more
distinguishable, the Download button more prominent, and the Check for
available update button better aligned. It reduces the space between
multiple available Moodle updates, too.
2020-04-10 14:41:13 +02:00
Eloy Lafuente (stronk7) 6090492eec Merge branch 'MDL-67919-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-04-10 11:55:30 +02:00
Eloy Lafuente (stronk7) 3d94784459 Merge branch 'MDL-67910-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-04-10 11:36:42 +02:00
Luca Bösch 4e445b9709 MDL-68392 travis: Fix validation warnings and infos
Can verify that this file passes the validation @
https://config.travis-ci.com/explore
2020-04-10 00:14:08 +02:00
Jun Pataleta 706f17d90f MDL-68355 gradingform_guide: Fix accessibility issues
* Add sr-only label for criterion information.
* Add sr-only label for frequently used comments picker button.
* Removed unused string grade_help.
* Fixed tags for hidden help texts, changing them from <small> to <span>
* Added aria-label for the score and additional comments fields so that
  the user would know which criterion they are currently working on.
* Added score_help and remark_help lang strings for more description
  for the score and additional comments fields.
* Remove text-muted class for additional comments' field label to avoid
  colour contrast issues.
2020-04-09 21:46:08 +08:00
Jun Pataleta de7c77913c MDL-67663 mod_forum: Show/hide elements from screen reader on search
* When the search input gets shown, users can still navigate on the
close button and the grading status container which can cause confusion
among users. So hide and show them accordingly as well.
* Hide/show user picker and body container when the search results
container is shown/hidden.
2020-04-09 21:44:28 +08:00
Jun Pataleta 485917574e MDL-67663 core: Do not use aria-hidden="false" on drawer
From https://www.w3.org/TR/wai-aria-1.1/#aria-hidden:
* "aria-hidden="false" is known to work inconsistently in browsers"
2020-04-09 21:44:28 +08:00
Jun Pataleta c20f4f5efd MDL-67663 mod_forum: Add missing lang strings 2020-04-09 21:44:28 +08:00
Jun Pataleta 8896d073e2 MDL-67663 mod_forum: Designate forum grading landmark regions
Adding the following landmark regions for easier keyboard navigation:
* Forum grading navigation
* User's forum posts
* Forum grading panel
2020-04-09 21:44:28 +08:00
Jun Pataleta c08eb88ae9 MDL-67663 mod_forum: Use proper lang string for aria-label
Use a proper language string for the aria-label of the hide grader
panel button instead of a hard-coded one.
2020-04-09 21:44:28 +08:00
Jun Pataleta dceb61ac68 MDL-67663 mod_forum: Fix focus order of the grading form
* Focus should flow from the form header down to the forum posts, and
then to the grading panel itself.
2020-04-09 21:44:28 +08:00
Jun Pataleta 79d668fc8f MDL-67663 mod_forum: Make user switching more accessible
* Add a more descriptive label for the next and previous buttons so that
the users would know that clicking on the next or previous buttons will
save the changes they made before proceeding to the next user.
* Add an sr-only div with aria-live to the user picker to let the grader
know the current user that is being graded.
* Hide the user picture from screen readers
2020-04-09 21:44:27 +08:00
Jwalit Shah 305060c055 MDL-66200 gradebook: check selected feedback option when importing data 2020-04-09 11:00:49 +10:00
Sara Arjona 49f07dc861 weekly release 3.8.2+ 2020-04-08 16:24:48 +02:00
Sara Arjona d6e96f06cc Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-04-08 16:24:45 +02:00
Andrew Nicols 7d726708ff Merge branch 'MDL-68148-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-04-08 11:24:14 +08:00
Shamim Rezaie c332400ba6 MDL-68148 user: remove the noscript tag
The submit button remains deactive if js is disabled. So having a
noscript tag to output a submit button here does not make sense.
2020-04-08 11:44:28 +10:00
Shamim Rezaie 94a55738ad MDL-68148 user: fixed stray end tag (input) 2020-04-08 11:44:28 +10:00
Shamim Rezaie b77c5e78dc MDL-68148 core_user: avoid multiple enrol buttons with the same id 2020-04-08 11:44:28 +10:00
Shamim Rezaie 5dfebd739f MDL-68148 core_user: set the fullname column as the header column
ref: https://www.w3.org/WAI/tutorials/tables/
2020-04-08 11:44:28 +10:00
Shamim Rezaie cabbb145dd MDL-68148 output: type attribute is unnecessary for javascript resources 2020-04-08 11:44:28 +10:00
Shamim Rezaie 351262b192 MDL-68148 core: remove cellspacing
The cellspacing attribute of <table> is not supported in HTML5.
So the removed line did not have any effect since ages ago.
2020-04-08 11:44:28 +10:00
AMOS bot 74ff19965a Automatically generated installer lang files 2020-04-08 00:11:13 +00:00
AMOS bot c1159327b4 Automatically generated installer lang files 2020-04-08 00:11:12 +00:00
Sara Arjona b5c776a789 Merge branch 'MDL-40081-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-04-07 15:10:14 +02:00
Sara Arjona 0a92167603 Merge branch 'MOODLE_38_MDL-68223' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-04-07 13:43:03 +02:00
Sara Arjona 7cb0548c1b Merge branch 'MOODLE_38_MDL-65700' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-04-07 13:34:22 +02:00
Mikhail Golenkov 214542af79 MDL-65700 javascript: Add url-polyfill. 2020-04-07 20:56:46 +10:00
Andrew Nicols 6a0f166fef Merge branch 'MDL-68285-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-04-07 13:43:06 +08:00
Sara Arjona c904d2249f Merge branch 'MDL-65539-m38' of https://github.com/NeillM/moodle into MOODLE_38_STABLE 2020-04-06 16:42:10 +02:00
Paul Holden 63cf950324 MDL-40081 completion: clean up criteria records for deleted courses. 2020-04-06 12:21:57 +01:00
Paul Holden 5a63310250 MDL-67499 restore: account for deleted user truncated email/username. 2020-04-06 12:09:54 +01:00
Eloy Lafuente (stronk7) 98014f03cd MDL-67499 restore: add 100% cov. to restore_dbops::precheck_user()
Supports multiple mails to be tested.

So we can perform changes to it and also some related stuff,
like delete_user() with confidence.
2020-04-06 11:48:36 +01:00
Paul Holden 80a8c362ea MDL-67499 user: truncate long username/email during user deletion. 2020-04-06 11:48:36 +01:00
Paul Holden 42396a33e9 MDL-68280 user: fix PHP notice for unknown user invalid login token. 2020-04-06 11:46:17 +01:00
Paul Holden 46a290b1b9 MDL-68279 admin: filter site fullname when sending test email. 2020-04-06 11:41:26 +01:00
Sara Arjona edb85411b8 Merge branch 'MDL-68239-38' of https://github.com/NinaHerrmann/moodle into MOODLE_38_STABLE 2020-04-06 10:18:40 +02:00
Jake Dallimore b90f72b304 MDL-68309 overrides: clarify inactive overrides help string 2020-04-06 07:38:21 +08:00
Eloy Lafuente (stronk7) 11b3c817a5 MDL-68047 tcpdf: Prevent images out from cache to be removed
This corresponds to https://github.com/tecnickcom/TCPDF/pull/174
(and was fixed bycommit 510070b) and was a regression causing
image files to be removed unconditionally. Only if the images
are from cache, they can be removed.

It's fixed upstream in version 6.3.4 and up.
2020-04-06 00:31:02 +02:00
Sara Arjona bcd723cf97 MDL-67919 dataprivacy: Fix behat error when contacting DPO 2020-04-03 19:49:43 +02:00
Ruslan Kabalin 13413304ef MDL-68315 formslib: Fix completion attribute in course form element.
This fixes 'onlywithcompletion' attribute in course form element.
2020-04-03 16:15:22 +01:00
n_herr03 39bf9c63e6 MDL-68239 mod_data: make required icon in multimenu visible 2020-04-03 12:21:04 +02:00
Neill Magill 8d6234bedc MDL-65539 dragdrop: Ignore drag proxy in keyboard menu
Before this change the node that is displayed during a the last mouse
drag and drop would be listed in a keyboard drag and drop if it was
the container node of one of the types of node being moved in this action.

If a node is inside a node with the .yui3-dd-proxy class then it is
one of the proxy elements used to display the dragged content during
mouse drag and drop so we will start ignoring it.
2020-04-03 08:37:47 +01:00
Neill Magill a7ac45bc7d MDL-65539 dragdrop: Allow sections and blocks to move to the top
Before this change sections and blocks could not be moved to be the
top item when using keyboard drag and drop.

They can now be moved to the top in one action.

The way they move using keyboard drag and drop has changed when they
are below the item they are dropped on, not instead of appearing
below it they will be placed above it.
2020-04-03 08:37:47 +01:00
Neill Magill 1170bb3465 MDL-65539 dragdrop: Allow direction detection when using keyboard
Before this change keyboard drag and drop could not detect the
direction of movement, this meant that an item would only be placed
below an item or at the top of a container item.

This change means that extending modules can declare
detectkeyboarddirection to true. This will mean that when an item is
moved it's position will be determined by the direction of travel as
it would be when dragging using the mouse.

If detectkeyboarddirection is true then:

* If you move an item upwards it will be placed before the item
  selected in the drop menu
* If you move a item downwards it will be placed after the item
  selected in the drop menu
* The item above the one being dragged will now be displayed on
  the drop menu

If detectkeyboarddirection is false there will be no change in
behaviour.
2020-04-03 08:37:46 +01:00
Neill Magill a8c0956b22 MDL-65539 course: Keyboad drag and drop should not break page
Before this change keyboard drag and drop of sections would alter
the structure of the page.

This occured because in this case the dragnode was the original node
2020-04-03 08:37:46 +01:00
Neill Magill 231d5161d6 MDL-65539 formats: Section labels not updated during move
Before this change when moving a section via drag and drop the
aria-label for the section was not being updated neither was the
title on the drag handle.

The result was the the drop menu on keyboard drag and drop displayed
the wrong information after a section was moved.
2020-04-03 08:37:46 +01:00
Neill Magill 96988de3ff MDL-68189 course: Section name change should display in DD menu
Before this patch if a section was renamed inline the old name was
still displayed in the keyboard drag and drop menu until the page
was refreshed.

This change ensures that the two places that section names were not
updated in get changed after an inline update to the name.
2020-04-03 08:37:26 +01:00
Sara Arjona 255b396328 weekly release 3.8.2+ 2020-04-02 16:51:17 +02:00
Sara Arjona 525688f879 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-04-02 16:51:14 +02:00
Marina Glancy 8effb03227 MDL-68323 core: add --max-lint-warnings option to grunt 2020-04-02 13:44:46 +02:00
Luca Bösch 0b4ac78d6d MDL-67672 user: Display name in user menu as elsewhere. 2020-04-02 00:17:41 +02:00
Eloy Lafuente (stronk7) 9c42bab6bc Merge branch 'MDL-68265-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-04-01 23:29:21 +02:00
Eloy Lafuente (stronk7) 4ea9f5d7db Merge branch 'MDL-68193_38' of git://github.com/mdjnelson/moodle into MOODLE_38_STABLE 2020-04-01 23:22:35 +02:00
Mark Nelson 390a7cc8d2 MDL-68193 core: added new database_text_field_content_replaced event 2020-04-01 23:20:54 +02:00
Eloy Lafuente (stronk7) b3c6d95eee Merge branch 'MDL-68191_38' of git://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-04-01 20:18:34 +02:00
Eloy Lafuente (stronk7) c0c6ffd9d5 Merge branch 'MDL-67995-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-04-01 19:11:50 +02:00
Jake Dallimore 8cee84e682 Merge branch 'MDL-67672-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-04-01 16:43:28 +08:00
Sara Arjona 97d21f097d Merge branch 'MDL-68281_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-04-01 09:25:25 +02:00
Sara Arjona aefb25dae5 Merge branch 'MDL-68277_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-04-01 09:14:47 +02:00
Luca Bösch b16cd34860 MDL-67672 user: Display name in user menu as elsewhere. 2020-04-01 09:03:39 +02:00
Sara Arjona 795a11a328 Merge branch 'MDL-58964-38' of git://github.com/abias/moodle into MOODLE_38_STABLE 2020-03-31 19:13:44 +02:00
Eloy Lafuente (stronk7) f9ecf3d3af Merge branch 'MDL-64494-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-03-31 18:59:24 +02:00
Bas Brands 463ad12363 MDL-64494 theme_boost: accessible theme colours 2020-03-31 18:54:19 +02:00
Sara Arjona 3b1be8fb8f Merge branch 'MDL-66245-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-03-31 15:09:15 +02:00
Sara Arjona 3466e64d62 MDL-67910 behat: PendingJS improvements for deleteevent modal 2020-03-31 08:40:43 +02:00
Jake Dallimore b38841280d Merge branch 'MDL-68144-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-03-31 13:59:39 +08:00
Eloy Lafuente (stronk7) 81c8aee9f2 Merge branch 'MDL-68269-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-30 22:54:17 +02:00
Eloy Lafuente (stronk7) 1e1eed0aa4 Merge branch 'MDL-68049-38' of https://github.com/spvickers/moodle into MOODLE_38_STABLE 2020-03-30 16:23:27 +02:00
cescobedo d2791a63ec MDL-68285 core_h5p: Fix unused variables and undeclared globals 2020-03-30 11:37:59 +02:00
Andrew Nicols ecc9d9c48c Merge branch 'MDL-52319-38-environmentxml' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-03-30 16:54:37 +08:00
Shamim Rezaie 3999cbaa6a MDL-68269 form: fieldset in group elements should be full width 2020-03-30 18:32:39 +11:00
cescobedo 6e3dfc7927 MDL-67995 format_singleactivity: Fix dropwdown type of activity 2020-03-30 08:27:02 +02:00
Mikhail Golenkov 4a363544eb MDL-68223 assign: Fix selection of comment text. 2020-03-30 14:57:36 +11:00
Andrew Nicols 478c14d75d MDL-68265 core_question: Switch question import to request dir 2020-03-30 08:14:46 +08:00
Andrew Nicols 02ed9c4196 MDL-68265 mod_lesson: Switch question import to request dir 2020-03-30 08:14:46 +08:00
AMOS bot 7d4ade8bb1 Automatically generated installer lang files 2020-03-29 00:11:46 +00:00
Eloy Lafuente (stronk7) 3eeadb6ae2 MDL-68281 unit test: Include required class
Also, add missing line break, that I did not see 1 week ago.
2020-03-28 16:27:29 +01:00
AMOS bot 548e3f2aef Automatically generated installer lang files 2020-03-28 00:11:38 +00:00
Tim Hunt 7e6d6f97aa MDL-68277 qtype_essay: answer area in reviews should be right size
The answer box size is set by teachers and provides a useful
visual cue how long a response was expected. Therefore, it is
useful to keep the space at least that size in quiz reviews, etc.
2020-03-27 14:12:37 +00:00
Luca Bösch 75532d2266 MDL-68144 mod_folder: make top margins less dominant for folder content 2020-03-27 07:12:54 +01:00
Jake Dallimore 49914a57d4 weekly release 3.8.2+ 2020-03-27 09:18:37 +08:00
Jake Dallimore c23192f642 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-03-27 09:18:36 +08:00
Eloy Lafuente (stronk7) fa33530059 Merge branch 'MDL-64429-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-26 18:38:18 +01:00
Paul Holden 02e24d7098 MDL-64429 tool_usertours: upgrade step to fix existing tours sortorder. 2020-03-26 16:48:56 +00:00
Eloy Lafuente (stronk7) 3d247d80bb Merge branch 'MDL-68183-38-mysqlpwdresetsql' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-03-26 01:18:20 +01:00
Eloy Lafuente (stronk7) 9f9134e1ae Merge branch 'MDL-63865-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-26 00:32:05 +01:00
Eloy Lafuente (stronk7) 39f07a058f Merge branch 'MDL-68116-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-03-26 00:28:11 +01:00
Eloy Lafuente (stronk7) 8d0fb6a548 Merge branch 'MDL-67442_38' of https://github.com/jonof/moodle into MOODLE_38_STABLE 2020-03-26 00:04:18 +01:00
Jun Pataleta 658624d7d0 Merge branch 'MDL-68149_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-03-26 00:09:38 +08:00
Jun Pataleta 4390cc47d9 Merge branch 'MDL-68153_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-03-25 22:34:27 +08:00
Jun Pataleta d89837abf6 Merge branch 'MDL-67024-38' of git://github.com/farhan6318/moodle into MOODLE_38_STABLE 2020-03-25 08:34:23 +08:00
Eloy Lafuente (stronk7) b669b3cb86 Merge branch 'MDL-67731-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-25 00:06:12 +01:00
Eloy Lafuente (stronk7) 570faa0c48 Merge branch 'MDL-67930-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-24 22:48:14 +01:00
Eloy Lafuente (stronk7) ed8046b929 Merge branch 'MDL-68068-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-03-24 22:39:32 +01:00
Jake Dallimore c155794221 Merge branch 'MDL-68135-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-24 12:10:55 +08:00
AMOS bot c1707b2b50 Automatically generated installer lang files 2020-03-24 00:11:05 +00:00
Alexander Bias eaf3679e08 MDL-58964 navigation: Reindex array when element is removed 2020-03-23 21:36:13 +01:00
David Mudrák b6caef105b MDL-52319 upgrade: Better report the environment checks in CLI scripts
Before we did not display the source of the environment check failure
(whether it was a core check or a plugin) and there was a missing space
before the "Error" status.
2020-03-23 11:27:01 +01:00
Tim Hunt 8eab502760 MDL-52319 install: Fix some coding style issues 2020-03-23 11:27:01 +01:00
Tim Hunt 213d9daf8d MDL-52319 upgrade: Also run environment checks if plugins need upgrades
Also perform the environment checks if a plugin triggers the upgrade.
Core upgrade and CLI upgrade was doing this already.
2020-03-23 11:27:01 +01:00
AMOS bot f09e31b9c2 Automatically generated installer lang files 2020-03-23 00:12:12 +00:00
Paul Holden 241edb45ec MDL-64429 tool_usertours: ensure tour sortorder can't move out of range. 2020-03-22 20:04:00 +00:00
Paul Holden e8c219a187 MDL-63865 tool_dataprivacy: unit test for plugin privacy provider. 2020-03-22 19:59:49 +00:00
Paul Holden 41831d5651 MDL-67731 backup: fix async restores in progress table listing. 2020-03-22 19:57:25 +00:00
Paul Holden 9fbbb1e46d MDL-67930 mod_forum: consistent default group image when hidden. 2020-03-22 19:55:00 +00:00
AMOS bot 4e64d26901 Automatically generated installer lang files 2020-03-22 00:10:44 +00:00
Sara Arjona d9c9c01f26 MDL-68116 atto_h5p: simplify fields to add H5P content
The embed section has been removed in order to simplify this screen.
It was added to make easier include content coming from h5p.org but,
as soon users won't be able to use it, it makes no sense.
Users will still be able to use the "HTML" button to paste the
embed code.
2020-03-20 10:08:00 +01:00
Sara Arjona da8426112f MDL-68116 filter_h5p: remove h5p.org from allowed sources
h5p.org has to be removed as default value for the allowedsources in
the "Display H5P" filter because H5P is going to close it down completely
so that only the author can see the test content.
2020-03-20 10:08:00 +01:00
cescobedo dc0cbc24f3 MDL-68068 core_h5p: Replace $_SESSION by $SESSION
The third-party library H5P has some references to  instead of Moodle's.
That implies that the information is not saved to backends and other issues,
so only the Moodle one should be used by core (core should be free from  and always use .).
2020-03-20 07:53:30 +01:00
Farhan Karmali 98ae29ae24 MDL-67024 Lib: Check if user->mnethostid is set before using it 2020-03-20 11:59:45 +05:30
Adrian Greeve 46fe2c5533 weekly release 3.8.2+ 2020-03-20 13:35:49 +08:00
Alexander Bias cf0270260b MDL-58964 navigation: Add class attributes to Boost flat navigation 2020-03-19 20:48:38 +01:00
Stephen Vickers c84b8e77f1 MDL-68049 mod_lti: Fix link-level memberships service
Fix cause of 404 error
Ensure personal name and email fields are included
Add ext_user_username field when being passed in LTI messages
2020-03-19 11:22:37 +00:00
Adrian Greeve 95d3c122bf Merge branch 'MDL-68081-MOODLE_38_STABLE' of https://github.com/kritisingh1/moodle into MOODLE_38_STABLE 2020-03-19 11:27:53 +08:00
Adrian Greeve 4fdcc6a534 Merge branch 'MDL-68014-38' of git://github.com/peterRd/moodle into MOODLE_38_STABLE 2020-03-19 11:04:54 +08:00
Jun Pataleta e1f9aa101b Merge branch 'MDL-68108-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE 2020-03-18 22:59:42 +08:00
Pau Ferrer Ocaña cc3985ed02 MDL-68108 formslib: Add element password inline template 2020-03-18 08:45:57 +01:00
Adrian Greeve 9d0c43f072 Merge branch 'MDL-67901-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-03-18 09:59:58 +08:00
Tim Hunt c16c0271bb MDL-68191 CSS minification: apply upstream performance/accuracy fix
There was a bug with the code to strip comments.
https://github.com/matthiasmullie/minify/issues/317

Applying the fix as a Moodle-specific change for now, because the
effect is significant.
2020-03-17 23:28:15 +00:00
David Mudrák bee8448520 MDL-68183 auth: Fix the performance of get_complete_user_data search
When searching for the user by a case-insensitive field (email address
is the only one supported now), the performance may be very poor as the
DB cannot use the index due to the LOWER() operation and the full
sequential scan of all the user records is performed. On some DBs such
as MySQL, this can be significantly improved by pre-filtering the users
with accent-insensitive search.

So we first perform accent-insensitive search for potential candidates
in a subselect, which can use the index. Only then we perform the
additional accent-sensitive search on this limited set or records.
2020-03-17 14:51:15 +01:00
David Mudrák d23fba1deb MDL-68183 auth: Fix the performance of signup_validate_data search query
When searching for other users with the same email address, we perform
the case-insensitive and accent-sensitive search. That may be expensive
as some DBs such as MySQL cannot use the index in that case. Instead,
sequential scan of all the user records is performed and the comparison
uses the LOWER function to filter the matching records. This leads to
significant performance heavy queries which in turn represent a surface
for DoS attacks.

For that reason, we first perform accent-insensitive search for
potential candidates in a subselect, which can use the index. Only then
we perform the additional accent-sensitive search on this limited set or
records.
2020-03-17 14:10:47 +01:00
David Mudrák 1e19d154ba MDL-68183 auth: Fix the performance of forgotten password user search
When searching for the user matching the given email address, we perform
the case-insensitive and accent-sensitive search. That may be expensive
as some DBs such as MySQL cannot use the index in that case. Instead,
sequential scan of all the user records is performed and the comparison
uses the LOWER function to filter the matching records. This leads to
significant performance heavy queries which in turn represent a surface
for DoS attacks.

For that reason, we first perform accent-insensitive search for
potential candidates, which can use the index. Only then we perform the
additional accent-sensitive search on this limited set or records.
2020-03-17 14:08:54 +01:00
Jun Pataleta d9eea68192 Merge branch 'MDL-68069-38' of git://github.com/cescobedo/moodle into MOODLE_38_STABLE 2020-03-17 16:14:49 +08:00
Adrian Greeve e2e6b49aab Merge branch 'MDL-67970-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-17 15:25:10 +08:00
Shamim Rezaie 41a5c8c54d MDL-67970 output: use fieldset in core/chooser instead of label 2020-03-17 18:20:06 +11:00
Shamim Rezaie b29634d89f MDL-67970 core: remove unnecessary roles
- The navigation role is unnecessary for element nav
- The textbox role is unnecessary for element textarea
2020-03-17 18:20:02 +11:00
Shamim Rezaie 3611f682e9 MDL-67970 output: replace new-sections attribute with data-new-sections
new-sections is not a valid attribute name for the a element.
Replaced that with data-new-sections
2020-03-17 18:20:02 +11:00
Shamim Rezaie 84c87b62f2 MDL-67970 output: fixed duplicate id attribute
action_menu::export_for_template generates the id attributes and send it
to core/action_menu_trigger template as part of the attributes variable.
2020-03-17 18:20:02 +11:00
Shamim Rezaie 9ecde13781 MDL-67970 search: fixed stray end tag (input) 2020-03-17 18:20:02 +11:00
Adrian Greeve 90227d2d76 Merge branch 'MDL-67981_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-03-17 11:32:30 +08:00
Jonathon Fowler 06c3a4cc55 MDL-67442 assign: expand/contract text works in all browsers now 2020-03-16 08:58:44 +10:00
kritisingh1 eed0cbe176 MDL-68081 Groups: Fixes string error in member removal function 2020-03-14 23:24:30 +05:30
Victor Deniz Falcon c78e908404 weekly release 3.8.2+ 2020-03-12 14:22:23 +00:00
Victor Deniz Falcon 7862e1fa12 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-03-12 14:22:17 +00:00
Eloy Lafuente (stronk7) 2f2f184cdb Merge branch 'MDL-66607-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-03-12 10:09:46 +01:00
Eloy Lafuente (stronk7) c96bfdd6a0 Merge branch 'MDL-68125-regression-MOODLE_38_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_38_STABLE 2020-03-12 01:19:41 +01:00
Brendan Heywood af97e88071 MDL-68125 core: Fixed $CFG->reverseproxyignore install regression 2020-03-12 09:53:54 +11:00
Eloy Lafuente (stronk7) 355f829ad9 Merge branch 'MDL-68061-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2020-03-11 22:56:23 +01:00
Tim Hunt 8a90179246 MDL-68153 qbank: question of unknown type should not cause fatal error
Regression casued by MDL-67153
2020-03-11 20:41:27 +00:00
Tim Hunt faf7ab39f2 MDL-68149 qtype_match: correctly distinguish 0 and 0.0 answers
Also added a test for backup & restore (which was working).
2020-03-11 13:44:26 +00:00
Tim Hunt 57cc9b6499 MDL-68149 qtype_match: Updatey tests to follow make_question() pattern 2020-03-11 13:44:26 +00:00
Andrew Nicols 736f6a6602 MDL-66607 message: Add pendingJS checks 2020-03-11 20:41:25 +08:00
Andrew Nicols 1c24b2f567 MDL-66607 message: Resolve race conditions in message deletion process
This commit makes several changes:
1) Explicitly stop polling for messages when a conversation is deleted;
2) Check for deleted conversations when displaying new messages;
3) Do not add a new empty conversation; and
4) Introduce pendingJS checks to ensure that Behat waits for messags to finish rendering.
2020-03-11 20:41:25 +08:00
Andrew Nicols c9a466cee7 Merge branch 'MDL-68146_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-03-11 11:52:03 +08:00
Eloy Lafuente (stronk7) 6b46f1a53a MDL-68146 forms: remove duped help and advanced icons in checkboxes
They are exceptionally shown later, after the checkbox text already.

This is a fix for the regression introduced by MDL-63424.
2020-03-10 23:04:08 +01:00
Eloy Lafuente (stronk7) 55b717ee66 Merge branch 'MDL-65724-38-3' of git://github.com/peterRd/moodle into MOODLE_38_STABLE 2020-03-10 13:51:25 +01:00
Eloy Lafuente (stronk7) 4d1ccc6700 Merge branch 'MDL-67189-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-03-10 11:30:32 +01:00
Shamim Rezaie 4293339fc9 MDL-68135 output: remove the presentation role from user pic
"presentation" is not a valid role for the img element.
Moreover, it doesn't make sense to have both role="presentation" and
aria-hidden="true" for an element at the same time.
For more info please see:
https://timwright.org/blog/2016/11/19/difference-rolepresentation-aria-hiddentrue/
2020-03-10 19:06:01 +11:00
Dani Palou fef31ac7c1 MDL-67189 external: Add test to catch PHP exceptions 2020-03-10 08:32:14 +01:00
Dani Palou 3f128fff10 MDL-67189 external: Catch Throwable in call_external_function 2020-03-10 08:32:14 +01:00
Eloy Lafuente (stronk7) 1aa7347965 Merge branch 'MDL-67827-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-03-09 20:36:17 +01:00
Sara Arjona 8fba462e74 Merge branch 'MDL-66671-m38-master' of https://github.com/dthies/moodle into MOODLE_38_STABLE 2020-03-09 18:49:11 +01:00
Sara Arjona 19b644ed08 Merge branch 'MDL-67968-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-09 18:17:06 +01:00
Sara Arjona 1bbace8bd0 Merge branch 'MDL-67902-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-09 15:06:49 +01:00
Andrew Nicols be9325c7cf MDL-67827 behat: Pending JS improvements for dialogues 2020-03-09 08:31:21 +08:00
Andrew Nicols 836e523edd MDL-67827 behat: Add missing exception use 2020-03-09 08:31:21 +08:00
AMOS bot 85162ad8e1 Automatically generated installer lang files 2020-03-09 00:11:53 +00:00
Tim Hunt 11212ea69b MDL-67981 questions: avoid errors deleting contextless questions 2020-03-06 18:02:36 +00:00
Shamim Rezaie 399369fb19 MDL-67968 calendar: use aria-label instead of the abbr tag 2020-03-07 04:12:28 +11:00
Shamim Rezaie 11a8af9012 MDL-67968 calendar: explain weekday abbreviations 2020-03-07 04:08:10 +11:00
Shamim Rezaie bb24115b88 MDL-67968 form: not to put empty label when no label is available 2020-03-07 04:08:10 +11:00
Shamim Rezaie d7bca2339a MDL-67968 question: do not display sr-only legends
.accesshide was removed because:
 1. It was only kept in case it's still used somewhere, in a custom form
 field for instance.
 2. It was broken since 3.5 where we integrated
 https://github.com/bmbrands/moodle/compare/ab65b87f3d...MDL-62419-master
 So it's been ages that the reason mentioned on point 1 was not being
 satisfied
2020-03-07 04:08:10 +11:00
Shamim Rezaie eebe003104 MDL-67968 form: grouped element label fix 2020-03-07 04:08:10 +11:00
Sara Arjona 9ce2442ea9 Moodle release 3.8.2 2020-03-06 12:34:11 +01:00
cescobedo 9f4968676a MDL-68069 core_h5p: delete cache assets when removing libraries
The cache assets linked to a library have to be removed also when a
library is deleted, in order to rebuild them again next time they are
required.
2020-03-06 09:51:31 +01:00
Peter fc51caf533 MDL-65724 core: Force restore to use the settings from the plan
When importing use the import settings.
2020-03-06 14:13:45 +08:00
AMOS bot 9044d294a2 Automatically generated installer lang files 2020-03-06 00:10:50 +00:00
Peter Dias 628c056258 MDL-68014 lti: Remove alt text for image 2020-03-06 07:57:06 +08:00
Sara Arjona cd9828dadf weekly release 3.8.1+ 2020-03-05 17:31:32 +01:00
Sara Arjona 28f2858004 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-03-05 17:31:28 +01:00
Michael Hawkins 941507e78a MDL-67861 core: Fix getremoteaddr unit test to match new proxy setup 2020-03-05 14:39:34 +08:00
Brendan Heywood 1954482cc5 MDL-67861 core: Added $CFG->reverseproxyignore IP subnet list
If your server is behind multiple reverse proxies that append to the
X-Forwarded-For header then you will need to specify a comma separated
list of ip addresses or subnets of the reverse proxies to be ignored
in order to find the users correct IP address.
2020-03-05 01:27:57 +01:00
Brendan Heywood 7d8096eb18 MDL-67861 libraries: Refactor is_ip_in_subnet_list in ip_utils 2020-03-05 01:27:57 +01:00
Brendan Heywood 1cf6629ba2 MDL-67861 admin: Default $CFG->getremoteaddrconf to only use REMOTE_ADDR 2020-03-05 01:27:57 +01:00
Brendan Heywood d403416579 MDL-67861 core: Use last ip in X-Forwarded-For list 2020-03-05 01:27:57 +01:00
Andrew Nicols 9d23ee9003 MDL-65106 theme_classic: Remove unused variable 2020-03-05 08:15:54 +08:00
Andrew Nicols c706dd09a3 Merge branch 'MDL-65106-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-03-05 08:15:48 +08:00
Eloy Lafuente (stronk7) 563931d924 Merge branch 'MDL-62768-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-04 18:37:17 +01:00
Sara Arjona a552c30018 Merge branch 'MDL-67696-MOODLE_38_STABLE_count_warning' of https://github.com/JayChurchward/moodle into MOODLE_38_STABLE 2020-03-04 17:55:48 +01:00
Bas Brands 5288ca8a73 MDL-67901 type_multichoice: clear my choice accessibility
Improve the accessibility for the clear my choice option. The
extra radio input controlling the reset feature was removed and
resetting the choice is now controlled by JavaScript.
This fixes the missing label reported in Accessibility audit and W3C
validation of the reset link

By this change this issue also fixes MDL-67280
2020-03-04 16:45:03 +01:00
Sara Arjona 2f7e2ff457 Merge branch 'MDL-67767-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-03-04 15:04:58 +01:00
Dani Palou 714a816050 MDL-67767 tool_mobile: Allow using more characters in forcedurlscheme 2020-03-04 14:22:54 +01:00
Sara Arjona e490f86d57 Merge branch 'MDL-67863-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-03-04 14:05:29 +01:00
Sara Arjona eccde3bc19 Merge branch 'MDL-67969-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-03-04 12:58:17 +01:00
Marina Glancy 4c16eba0b5 MDL-56287 gradereport_history: Separate groups queries improved 2020-03-04 11:47:19 +01:00
Jun Pataleta ec7ce8f204 MDL-56287 gradereport_history: Show users from groups that can be viewed 2020-03-04 11:47:19 +01:00
Eloy Lafuente (stronk7) 47f96d5e9f Merge branch 'MDL-67641-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-03-04 10:47:55 +01:00
Sara Arjona be47691d79 Merge branch 'MDL-68008-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2020-03-04 08:41:30 +01:00
Dani Palou 235f139992 MDL-67641 auth: Fix shortname type in get_signup_settings WS 2020-03-04 08:12:04 +01:00
AMOS bot e10cf2368a Automatically generated installer lang files 2020-03-04 00:11:12 +00:00
Eloy Lafuente (stronk7) 7bda43ee60 Merge branch 'MDL-67728-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE 2020-03-03 19:50:17 +01:00
Eloy Lafuente (stronk7) 28298a6fe9 Merge branch 'MDL-68038-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-03-03 19:45:15 +01:00
Eloy Lafuente (stronk7) ddaee0c87d Merge branch 'MDL-67971-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-03-03 19:02:30 +01:00
Sara Arjona 9515f40ced Merge branch 'MDL-67993-38' of git://github.com/lameze/moodle into MOODLE_38_STABLE 2020-03-03 18:06:37 +01:00
Ferran Recio 7949aaceae MDL-68008 tool_capability: shows multiple contexts when overrides exists 2020-03-03 17:51:27 +01:00
Sara Arjona 305807d27b Merge branch 'MDL-68048-38-behatnotfound' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-03-03 17:01:44 +01:00
Sara Arjona 845c943d7f Merge branch 'MDL-68060-38-huburlcompare' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-03-03 13:10:13 +01:00
Sara Arjona 007ab3cf17 Merge branch 'MDL-67891-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-03-03 12:48:24 +01:00
Bas Brands 8540968781 MDL-65106 theme_classic: set custom navigationitem icon 2020-03-03 11:53:41 +01:00
Sara Arjona 8bf66cf2d3 Merge branch 'MDL-63316-38' of https://github.com/azito122/moodle into MOODLE_38_STABLE 2020-03-03 11:10:46 +01:00
Sara Arjona e0ba5fb608 Merge branch 'MDL-67945-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2020-03-03 10:10:45 +01:00
Sara Arjona 3687eb52a0 Merge branch 'MDL-67749-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-03-03 09:30:21 +01:00
Adrian Hutchinson 80f4ad43b8 MDL-67988 mod_lti: remove padding from JWS base64url encoding 2020-03-02 14:01:05 +01:00
Paul Holden 9da23023af MDL-67891 tool_cohortroles: move upgrade step inside plugin.
The step added in MDL-67458 was added to core, which broke the upgrade
process if this plugin had been uninstalled prior.
2020-03-02 08:50:35 +00:00
Sara Arjona caf37336d2 MDL-67971 core_badges: review issuer URL 2020-03-02 08:02:31 +01:00
Sara Arjona b3eb933a40 MDL-68038 core_h5p: rename can_update_library test 2020-03-02 08:00:54 +01:00
Andrew Zito b7fe18eb8b MDL-63316 participants: lastname sort for participants table 2020-02-28 14:34:01 -05:00
Daniel Thies 4a2e0b810f MDL-66671 enrol_lti: Skip grade sync when cm deleted 2020-02-28 09:30:34 -06:00
Eloy Lafuente (stronk7) b4a13e9a65 weekly release 3.8.1+ 2020-02-28 12:22:42 +01:00
Bas Brands 324d931ed0 MDL-67863 theme_boost: change keyboard tab order
Move navdrawer up in the dom for a more logical tab order
Hide navdrawer links for tab / screenreader when navdrawer is closed
2020-02-27 17:11:45 +01:00
Michael Hawkins 535be631f8 MDL-68061 gradereport_history: Restrict per page config value to int 2020-02-27 15:41:23 +08:00
Eloy Lafuente (stronk7) c2a1fb945e Merge branch 'MDL-67865-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-02-26 23:37:00 +01:00
Eloy Lafuente (stronk7) 9adfd8ccd5 Merge branch 'MDL-64686-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-02-26 23:27:29 +01:00
Eloy Lafuente (stronk7) 779f58b227 Merge branch 'MDL-67758-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-02-26 17:35:55 +01:00
Eloy Lafuente (stronk7) a4a667ab06 Merge branch 'MDL-67132-MOODLE_38' of https://github.com/cengage/moodle into MOODLE_38_STABLE
(amended to move the upgrade.txt info to correct 3.8.2)
2020-02-26 17:18:15 +01:00
Eloy Lafuente (stronk7) fc7e263912 Merge branch 'MDL-67979-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-02-26 17:13:37 +01:00
Anthony Forth c47d17b93b MDL-67945 enrol: missing $DB in edit_instance_form 2020-02-26 16:34:38 +01:00
David Mudrák 5aea4d98cb MDL-68060 registration: Improve the sites directory location check
This allows to define the custom HUB_MOODLEORGHUBURL with HTTP Basic
Auth credentials so that the registration features can be tested against
our staging site.
2020-02-26 10:56:05 +01:00
Jun Pataleta b6970abb18 Merge branch 'MDL-67921-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-02-26 16:51:12 +08:00
Jun Pataleta d2b37ff747 Merge branch 'MOODLE_38_MDL-67980' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-02-26 14:30:40 +08:00
David Balch 75d4b0f949 MDL-67993 roles: Fix pix_icon() calls. 2020-02-26 12:15:31 +08:00
Claude Vervoort d2c96c5be9 MDL-67132 mod_lti: document new param 2020-02-25 21:24:36 -05:00
Eloy Lafuente (stronk7) 80509c0cdd Merge branch 'MDL-67644-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-02-26 00:10:13 +01:00
Eloy Lafuente (stronk7) 2de3eefda5 Merge branch 'MDL-67806-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-02-25 23:57:55 +01:00
Eloy Lafuente (stronk7) 5d83769d27 Merge branch 'MDL-67237-38' of git://github.com/dpalou/moodle into MOODLE_38_STABLE 2020-02-25 23:53:28 +01:00
Eloy Lafuente (stronk7) 341a509763 Merge branch 'MDL-67920-38' of git://github.com/aanabit/moodle into MOODLE_38_STABLE 2020-02-25 23:33:39 +01:00
Paul Holden 0111c671e4 MDL-62768 tool_policy: add page title & breadcrumb navigation. 2020-02-25 22:05:56 +00:00
Paul Holden a8df356e33 MDL-62768 tool_dataprivacy: add page breadcrumbs to navigation. 2020-02-25 21:37:56 +00:00
Helen Foster 69935b2021 MDL-67979 lang: Import fixed English strings (en_fix)
* configcustommenuitems,core_admin - corrected example
* custommenuitems_desc,tool_mobile - fallback behaviour of custom menu
  items in the app
2020-02-25 12:23:36 +01:00
Eloy Lafuente (stronk7) b424d7956e Merge branch 'MDL-67862-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-02-25 12:09:48 +01:00
Eloy Lafuente (stronk7) 34a98290d2 Merge branch 'MDL-67364-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2020-02-25 12:05:48 +01:00
David Mudrák 706e99c6d4 MDL-68048 behat: Fix the ElementNotFoundException message wording
The exception class itself adds the "not found" to the error message.
2020-02-25 11:55:57 +01:00
Shamim Rezaie 169917563c MDL-67902 calendar: keyboard users should be able to toggle day popover 2020-02-25 03:40:45 +11:00
Shamim Rezaie 7df5814667 MDL-67902 calendar: informative aria label for event days in mini cals 2020-02-25 03:40:45 +11:00
Shamim Rezaie fa88a2c32a MDL-67902 calendar: informative aria label for event days in calendar 2020-02-25 03:40:44 +11:00
Shamim Rezaie 66fbe3c48b MDL-67902 calendar: Fix label of the course filter in calendar 2020-02-25 03:40:44 +11:00
Mikhail Golenkov 3d20910e88 MDL-67980 tasks: Sort ad-hoc tasks by nextruntime. 2020-02-24 09:32:37 +11:00
Pau Ferrer Ocaña 7d623c4a45 MDL-67728 behat: Increase app start timeout 2020-02-21 12:46:04 +01:00
Pau Ferrer Ocaña 1c447dcc44 MDL-67728 behat: Improve behat app selectors 2020-02-21 12:46:04 +01:00
Sara Arjona ae778f4193 MDL-67921 core_h5p: re-implement framework->getOption
The implementation done for getOption was not correct because it
was only taking into account the displayoptions for download and
embed.
Besides, setOption implementation has been added.
2020-02-21 09:29:29 +01:00
Amaia Anabitarte c1fbab8a81 MDL-67920 core_h5p: Move upload button into form and fix title
Minor bugs in Site administration > H5P > Manage H5P content types admin page'
2020-02-21 09:00:16 +01:00
Luca Bösch 26143b5d62 MDL-64686 theme: align course search form for small screens sizes. 2020-02-21 06:36:40 +01:00
Jun Pataleta 7b37466710 weekly release 3.8.1+ 2020-02-21 11:04:05 +08:00
Jun Pataleta 09f6b75f70 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-02-21 11:03:25 +08:00
Eloy Lafuente (stronk7) cd0e753519 Merge branch 'MDL-67727-38' of git://github.com/crazyserver/moodle into MOODLE_38_STABLE 2020-02-20 16:12:48 +01:00
Eloy Lafuente (stronk7) 4d951d4bac Merge branch 'MDL-67899-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-02-20 00:41:29 +01:00
Luke Tucker 421537407d MDL-50455: tool_capability: Use static cache when loading context data 2020-02-20 00:29:32 +01:00
Eloy Lafuente (stronk7) 61f6f15177 Merge branch 'MDL-67942-38' of https://github.com/HuongNV13/moodle into MOODLE_38_STABLE 2020-02-19 19:18:44 +01:00
Eloy Lafuente (stronk7) 11a4df56f8 Merge branch 'MDL-67947_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-02-19 17:48:26 +01:00
Tim Hunt 7bde84a705 MDL-67947 questions: questions_in_use should ask all components
Previously it was only checking mods.
2020-02-19 11:58:12 +00:00
Dani Palou 4d4b22da05 MDL-67749 ws: Set private token when reset or manual create token 2020-02-19 12:04:57 +01:00
Shamim Rezaie 85a43994ca MDL-67969 lib: Fix duplicate blockinstanceid for fake blocks 2020-02-19 21:25:47 +11:00
Huong Nguyen fcf3d8b748 MDL-67942 Quiz: Quiz attempt report delete_selected_attempts issue 2020-02-19 15:35:55 +07:00
Eloy Lafuente (stronk7) 663cdc54fe Merge branch 'MDL-67471_38' of https://github.com/t-schroeder/moodle into MOODLE_38_STABLE 2020-02-18 23:54:44 +01:00
Eloy Lafuente (stronk7) 4eeb89d0a7 Merge branch 'MDL-61390-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-02-18 19:06:51 +01:00
Eloy Lafuente (stronk7) b6aae0fc5b Merge branch 'MDL-67953-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-02-18 17:18:58 +01:00
Shamim Rezaie 68a3863961 MDL-67865 output: Fix id of the dropdown trigger 2020-02-18 16:19:17 +11:00
Eloy Lafuente (stronk7) 7e17a2a4fc Merge branch 'MDL-61389-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-02-17 23:30:08 +01:00
Eloy Lafuente (stronk7) bb6281a5c9 Merge branch 'MDL-67817-m38-master' of https://github.com/dthies/moodle into MOODLE_38_STABLE 2020-02-17 22:09:05 +01:00
Tim Schroeder 4745203bc0 MDL-67471 message: fixed mark_notification_read with messaging disabled 2020-02-17 09:16:13 +01:00
Jun Pataleta f1dd21a3c7 MDL-61390 mod_forum: Create template for forum search results 2020-02-17 15:58:04 +08:00
Jun Pataleta 4d90df63d2 MDL-61389 mod_forum: Descriptive aria-label for "Discuss this topic" 2020-02-17 15:52:06 +08:00
AMOS bot 37397ed119 Automatically generated installer lang files 2020-02-16 00:11:11 +00:00
Daniel Thies b9792633c9 MDL-67817 core_date: Add test for timezone localization strings 2020-02-14 11:56:33 -06:00
Daniel Thies f5677dadeb MDL-67817 core_lang: Update timezone strings 2020-02-14 11:56:33 -06:00
Sara Arjona 199ff6cc6b weekly release 3.8.1+ 2020-02-14 12:12:12 +01:00
Sara Arjona 462002f1ec Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-02-14 12:12:10 +01:00
Jun Pataleta 7fdcd5cb4d Merge branch 'MDL-67965-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-02-14 13:25:10 +08:00
Andrew Nicols ca63a87509 MDL-67965 behat: Get theme-specific context classes correctly 2020-02-14 10:15:49 +08:00
Claude Vervoort 1fde9dea67 MDL-67132 mod_lti: call grade api to trigger course total computation 2020-02-13 18:45:05 -05:00
Michael Hawkins 2359ec14f7 MDL-67364 output: Add unit testing for editor_scss_to_css 2020-02-13 22:53:19 +08:00
Michael Hawkins 999bb6578b MDL-67364 output: Allow child themes to use parent editor_scss config
This still allows child themes to override editor_scss, but will fall
back to what the parent is using if they do not specify it. This
negates the need for every child them to have the config duplicated
in order to utilise it.
2020-02-13 22:53:19 +08:00
Pau Ferrer Ocaña 71f62ad8ce MDL-67727 behat: Reset ionic app properly 2020-02-13 08:37:28 +01:00
Andrew Nicols 8ccb773f9b MDL-67953 grunt: Work around spawn length limits 2020-02-13 13:34:03 +08:00
Eloy Lafuente (stronk7) 84a6421857 Merge branch 'MDL-67876_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-02-12 15:51:17 +01:00
Dani Palou c3fc5fca65 MDL-67644 tool_mobile: Add OAuth 2 providers in disabled features 2020-02-12 14:13:17 +01:00
Tim Hunt bb9176eee4 MDL-67876 forms: not all field types need validation JS 2020-02-12 10:02:27 +00:00
Tim Hunt 5048dbbf06 MDL-67876 forms: scroll to any invalid element if form cannot submit 2020-02-12 10:01:24 +00:00
Shamim Rezaie a2d619941f MDL-67899 message: Add aria-label to the emoji picker button 2020-02-12 15:40:45 +11:00
Eloy Lafuente (stronk7) 5df69d28ad Merge branch 'MDL-67532-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-02-11 23:08:07 +01:00
Eloy Lafuente (stronk7) 95ecaf2d1e Merge branch 'MDL-67675-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-02-11 22:56:17 +01:00
Eloy Lafuente (stronk7) 13caf292eb Merge branch 'MDL-67690-38' of git://github.com/merrill-oakland/moodle into MOODLE_38_STABLE 2020-02-11 22:45:27 +01:00
Sara Arjona 1fae040842 Merge branch 'MDL-59303-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-02-11 13:52:29 +01:00
Sara Arjona 659795e8e8 Merge branch 'MDL-66847-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-02-11 12:28:46 +01:00
Sara Arjona 5e3aad0090 Merge branch 'MDL-66834-MOODLE_38_STABLE' of https://github.com/kepeter/moodle into MOODLE_38_STABLE 2020-02-11 11:54:22 +01:00
Sara Arjona 934e913a97 Merge branch 'mdl67142-moodle38' of https://github.com/AngadSethi/moodle into MOODLE_38_STABLE 2020-02-11 10:18:59 +01:00
Sara Arjona a10e70cf56 Merge branch 'MDL-67894-38' of https://github.com/grabs/moodle into MOODLE_38_STABLE 2020-02-11 08:20:38 +01:00
Dani Palou c618f24c70 MDL-67758 airnotifier: Send wwwroot to airnotifier 2020-02-10 11:55:51 +01:00
Jun Pataleta fb13d3a118 MDL-66245 privacy: Encode each part of the data URL instead of the whole 2020-02-10 16:56:10 +08:00
Jun Pataleta 90a3ce934e MDL-67862 message: Render dialogue header only when necessary 2020-02-10 13:12:35 +08:00
Angad Sethi 9dd517653c MDL-67142 quiz: fixed error when deleting saved questions long-name-quiz
An error was showing up while deleting questions
(in the question_save_from_deletion method) which had been saved
and which belonged to a quiz with a super long name, not exceeding 255
characters, as the 'name' field in 'question_categories' table had a
max size of 255 characters. The shorten_text function was used to
shorten the string to 255 characters and a unit test was added with
the name test_question_save_from_deletion_quiz_with_long_name to test
the patch.
2020-02-08 19:46:59 +05:30
AMOS bot 68b1fa37d5 Automatically generated installer lang files 2020-02-08 00:11:54 +00:00
Andreas Grabs df55da0a4b MDL-67894 mod_feedback: database error on show responses 2020-02-07 18:47:37 +01:00
Paul Holden f179253ab7 MDL-59303 auth_shibboleth: consistent readme URL. 2020-02-07 14:26:06 +00:00
Luca Bösch 82fa8144a5 MDL-66847 webservice: Correct breadcrumb + title for ws documentation. 2020-02-07 14:40:10 +01:00
Paul Holden 103c623b83 MDL-67532 badges: better default for new badge language. 2020-02-07 09:47:03 +00:00
Sara Arjona 9691980198 weekly release 3.8.1+ 2020-02-07 09:44:56 +01:00
Sara Arjona 3ae5f9ce0c Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-02-07 09:44:54 +01:00
Brendan Heywood 8973440f1f MDL-67726 tool_phpunit: add missing input escaping 2020-02-06 19:43:32 +01:00
Dani Palou 71b91e606b MDL-67237 tool_mobile: Add H5P offline option in disabled features 2020-02-06 11:34:10 +01:00
Andrew Nicols b079a267b4 Merge branch 'MDL-67175-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2020-02-06 10:20:54 +08:00
Eloy Lafuente (stronk7) 5016b08fcc Merge branch 'MDL-67832_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE
(fixed a couple of typos in the merge commit)
2020-02-06 00:02:25 +01:00
Eloy Lafuente (stronk7) c58d4d4591 Merge branch 'MDL-67732-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-02-05 20:05:41 +01:00
Eloy Lafuente (stronk7) ff3b9e1afa Merge branch 'MDL-67830_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-02-05 19:08:05 +01:00
Andrew Nicols 0d3c0e4377 Merge branch 'MDL-49103-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2020-02-05 13:51:15 +08:00
Eloy Lafuente (stronk7) 7005e1c999 Merge branch 'MDL-67842_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-02-04 22:46:24 +01:00
Eloy Lafuente (stronk7) bed550541b Merge branch 'MDL-63424-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-02-04 19:28:44 +01:00
Eloy Lafuente (stronk7) ca9ff05eba Merge branch 'MDL-66875-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-02-04 19:02:33 +01:00
Sara Arjona 2ff1e5d1fa MDL-49103 badges: bake badges with iTXt chunk instead of tEXt
The final OB 1.0 specification changed the baking badges method
from tEXt to iTXt. Besides, the iTXt chunk should be a signed
assertion or the raw JSON (instead of the assertion URL).
This has been changed in order to make Moodle OB compliant.

Yuliya Bozhko, thanks for the patch! :-)
2020-02-04 18:50:01 +01:00
Ferran Recio 5bd9eaaef0 MDL-67175 mod_scorm: fixing js eslint errors 2020-02-04 12:37:31 +01:00
Sam Hemelryk ede71aea73 MDL-67175 mod_scorm: sync XHR requests use sendBeacon when available
Totara reference TL-22621 (original code by Sam Hemelryk)
https://github.com/moodle/moodle/commit/2add402f8183c50bc1238ef2da5ea9cd06cb1dd9
2020-02-04 12:37:31 +01:00
Brendan Cox ab1939e5e6 MDL-67175 session: set SameSite=None for Chrome 78 and above
Totara reference TL-22311 (original code by Brendan Cox and Sam Hemelryk)
https://github.com/moodle/moodle/commit/a3f4de2b7efe66de6617a67ce7c87f2862e76ac6
2020-02-04 12:37:15 +01:00
Andrew Nicols 045d69a61d Merge branch 'MDL-60126-38-3' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-02-04 14:40:20 +08:00
Peter c6e2821be1 MDL-60126 competency: Unit tests 2020-02-04 08:51:50 +08:00
Simey Lameze 75c21efdea MDL-60126 core: upgrade step to clean user comp 2020-02-04 08:51:45 +08:00
Simey Lameze c852a0d308 MDL-60126 competency: delete content upon user delete 2020-02-04 08:40:25 +08:00
AMOS bot f722f3ef15 Automatically generated installer lang files 2020-02-04 00:11:15 +00:00
Sara Arjona e47f0220a6 Merge branch 'MDL-67721-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-02-03 14:52:30 +01:00
Sara Arjona 94e2bc3cac Merge branch 'MDL-67511-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-02-03 14:10:30 +01:00
Peter Eliyahu Kornfeld 90ae31ecb1 MDL-66834 Questions: add transaction, move trigger 2020-02-03 12:28:19 +02:00
Andrew Nicols feb32ff597 MDL-67511 core: Adjust spacing at top of toast-wrapper 2020-02-03 07:38:06 +08:00
Tim Hunt e5c2879063 MDL-67832 quiz: fix lots of PHPdoc in attemptlib.php 2020-01-31 19:09:28 +00:00
Paul Holden c3496f8599 MDL-67732 group: observe viewfullnames capability.
Backport from MDL-67245.
2020-01-31 16:48:08 +00:00
JayChurchward 7476acd514 MDL-67696 mod_forum: Changed invalid count() to loop counter. 2020-01-30 15:01:24 -05:00
Tim Hunt 8ad3593d0c MDL-67842 questions: Cannot remove the idnumber from a question 2020-01-30 17:29:23 +00:00
Eloy Lafuente (stronk7) 7f697f7a44 weekly release 3.8.1+ 2020-01-30 16:11:27 +01:00
Eloy Lafuente (stronk7) efcc2a7ac5 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-01-30 16:11:24 +01:00
Jun Pataleta d2ba630385 Merge branch 'MDL-67353-38' of https://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-30 12:41:22 +08:00
Eloy Lafuente (stronk7) b2dfaa5d3a MDL-67353 course: move form tearDown() to reset_all_data()
We are already cleaning all sort of caches, statics, singletons
there and it's better to ensure they are always reset to avoid
myterious failures @ distance.
2020-01-30 12:41:04 +08:00
Eloy Lafuente (stronk7) ccb5136b94 MDL-67353 filters: fix filterlib tests
- move resetAfterTest() to test units.
- remove setUp(), moving code to remove_all_filters_from_config().
- remove class properties, moving to return values of own setup_xxx() methods.
2020-01-30 12:41:04 +08:00
Eloy Lafuente (stronk7) 89a4d27f34 MDL-67353 favourites: Random DB id matching solved
Depending on the tests executed it was possible to arrive
to favourites tests with 2 "concepts" (say userid and contextid,
or userid and itemid) having the same ID.

Then, the array_diff() operations used by some mock stuff in the
tests wrongly was returning matches by value, ultimately causing
the test to fail.

Now, the matching is performed using array_diff_assoc() that takes
keys into considation when performing the match.
2020-01-30 12:41:04 +08:00
Andrew Nicols b2e08b7caa MDL-67353 course: Fix more broken unit tests 2020-01-30 12:41:04 +08:00
Andrew Nicols a946a9aac6 MDL-67353 course: Fix broken unit test 2020-01-30 12:41:04 +08:00
Michelle Melton ad5a2c9b07 MDL-64169 course: fix padding when display on one section per page
(amended to keep the $o.= consistent with surrounding code)
2020-01-29 22:35:49 +01:00
Tim Hunt 54908ae907 MDL-67830 quiz: notice in grade details redirect script 2020-01-29 18:35:28 +00:00
Jun Pataleta 36d2a83aa6 Merge branch 'MDL-67626_38' of git://github.com/adpe/moodle into MOODLE_38_STABLE 2020-01-29 21:37:08 +08:00
Adrian Greeve e02fbba097 Merge branch 'MDL-67768-38-componentdirs' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-01-29 10:02:58 +08:00
Eloy Lafuente (stronk7) d18b6693ad Merge branch 'MDL-67472-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-01-28 22:57:37 +01:00
Eloy Lafuente (stronk7) 9b1e5ee508 Merge branch 'MDL-52189_38' of https://github.com/jonof/moodle into MOODLE_38_STABLE 2020-01-28 22:45:14 +01:00
Eloy Lafuente (stronk7) c11ad45a99 Merge branch 'MDL-67447-38-autocomplete' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-01-28 22:24:31 +01:00
Eloy Lafuente (stronk7) c1ad1072da Merge branch 'MDL-67722-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2020-01-28 20:13:37 +01:00
David Mudrák 572c8c74cc MDL-67447 form: Fix the duplicate autocomplete selection node
When the autocomplete selection is updated, the content of the selection
wrapper is replaced with the new list of selected items. We must replace
only the content of the selection wrapper and not to nest it into
itself.
2020-01-28 19:52:29 +01:00
Shamim Rezaie 4a87ffb336 MDL-67675 atto_h5p: No need to manually clear the H5P placeholder 2020-01-28 22:30:37 +11:00
Eloy Lafuente (stronk7) 0419687a7f Merge branch 'MDL-57755_38' of https://github.com/t-schroeder/moodle into MOODLE_38_STABLE 2020-01-28 10:34:56 +01:00
David Mudrák d8cc1761f1 MDL-67768 core: Add some common dirs to core_component::$ignoreddirs
The core_component::$ignoreddirs lists all directories that are reserved
and cannot be used as valid plugin names. This is particularly important
for some plugin types such as 'webservice' that share the same root
location as the core subsystem of the same name.
2020-01-28 10:33:37 +01:00
Adrian Greeve 1ff0018969 Merge branch 'MDL-67740-38-behatstepsfilter' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-01-28 15:07:56 +08:00
Adrian Greeve 557a351daf Merge branch 'MOODLE_38_MDL-67746' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-01-28 13:13:45 +08:00
AMOS bot 916130a390 Automatically generated installer lang files 2020-01-28 00:11:42 +00:00
Adrian Greeve c3c3d12462 Merge branch 'MDL-67691_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-28 07:53:31 +08:00
Shamim Rezaie c385803441 MDL-67721 mod_forum: See 'view grade' button on single discussion forums 2020-01-28 05:03:12 +11:00
Eloy Lafuente (stronk7) 912ba0f5d0 Merge branch 'MDL-64531-38-questiondeletejson' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-01-27 17:08:07 +01:00
Eloy Lafuente (stronk7) b25bd34adf Merge branch 'MDL-67577-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-01-27 16:19:49 +01:00
Eloy Lafuente (stronk7) 7163df9a93 Merge branch 'm38_MDL-67414_Add_PostgreSQL_12x_Support' of https://github.com/scara/moodle into MOODLE_38_STABLE 2020-01-27 12:16:17 +01:00
Bas Brands 1719110c23 MDL-67577 core_message: navbar_output order
* moved the logic from core_message_popup_render_navbar_output to
message_popup_render_navbar_output in message/output/popup/lib.php

* using float: left instead of float: right in theme
2020-01-27 12:15:18 +01:00
Dani Palou bb0a08a7b4 MDL-67806 tool_mobile: Add Dark mode option in disabled features
We must allow site admins to remotely disable that feature in the app
2020-01-27 11:33:04 +01:00
Tim Schroeder c2f2919cf8 MDL-57755 message: fix notificaiton read status when messaging disabled 2020-01-27 09:18:28 +01:00
Matteo Scaramuccia ec2ea6c725 MDL-67414 adodb: Backport upstream fix for PostgreSQL 12.x
Upstream: https://github.com/ADOdb/ADOdb/commit/a4876f100602c2ce4760bb72d3050f73387adcca
          pgsql: stop using obsolete pg_attrdef.adsrc column
2020-01-26 09:40:22 +01:00
Matteo Scaramuccia 05a89b9b45 MDL-67414 database: Fixed PostgreSQL 12.x support 2020-01-26 09:40:21 +01:00
AMOS bot 5b90fa9f73 Automatically generated installer lang files 2020-01-25 00:11:41 +00:00
Luca Bösch a2841e3af6 MDL-66875 calendar: allow the use of day, mon and year again. 2020-01-25 01:01:54 +01:00
Luca Bösch de9c260296 MDL-63424 form: allow checkboxes to have req icon. 2020-01-24 17:38:20 +01:00
David Mudrák 2648ab76be MDL-67740 behat: Show info as collapsed at the acceptance testing page
The static information with the links to Behat documentation is quite
long an irrelevant for experienced developers returning to this page. No
need to waste the prominent screen place with it - better to offer it
only when needed via collapsible form section.
2020-01-24 10:44:37 +01:00
David Mudrák aa9f7001da MDL-67740 behat: Improve the layout of the acceptance testing page
- The CSS contains more specific selectors.
- Make use of the whole screen width for the list of found steps.
- Visually distinguish found steps from each other.
- Make it look less like a unicorn rainbow.
2020-01-24 10:44:37 +01:00
David Mudrák 5013ed92a2 MDL-67740 behat: Fix the name of the class in the inline documentation
The said class is provided by the moodlehq/behat-extension composer
package and was renamed as a part of upgrade to Behat 3.0.x (MDL-46891).
2020-01-24 10:44:37 +01:00
David Mudrák c538c5a1a3 MDL-67740 behat: Allow multiple words filter at acceptance testing page
Because of the too strict input param type, the form did not allow to
search for Behat steps containing the given phrase. The patch sets the
param type to match the one in the form definition, and makes sure that
the submitted value can be safely used as a CLI script argument.
2020-01-24 10:44:37 +01:00
Mikhail Golenkov 2cb5e23006 MDL-67746 Tasks: Cleanup task logs in chunks. 2020-01-24 14:03:48 +11:00
Adrian Greeve 85a035b1c5 weekly release 3.8.1+ 2020-01-24 10:17:40 +08:00
Adrian Greeve 1f3bc3164e Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-01-24 10:17:30 +08:00
Eric Merrill 7bfcb01b81 MDL-67690 block_myoverview: Clean usage of starred vs favourites
The block accidentally mixes usage of starred vs favourites, but core
requires favourites. This fixes the issue of user settings remembering
the correct value without a more major work.
2020-01-23 15:22:02 -05:00
Eloy Lafuente (stronk7) 2abbcb4761 Merge branch 'MDL-51225-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-23 11:14:12 +01:00
Jun Pataleta 9afa3fc326 MDL-51225 mod_forum: Revert @javascript tag removal
Put back the removed  @javascript tag to prevent random goutte
fails.
2020-01-23 15:30:36 +08:00
Jun Pataleta b4466151b0 Merge branch 'MDL-67118_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-23 12:55:28 +08:00
Jun Pataleta e4ae433b3b Merge branch 'MDL-67115_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-23 11:40:57 +08:00
Jun Pataleta 7c7932aaa5 Merge branch 'MDL-65952_m38' of https://github.com/fabiendallet/moodle into MOODLE_38_STABLE 2020-01-23 10:43:41 +08:00
Eloy Lafuente (stronk7) 5977f2fc3d Merge branch 'MDL-67296-38' of git://github.com/vmdef/moodle into MOODLE_38_STABLE 2020-01-22 23:46:18 +01:00
Víctor Déniz Falcón f7355ebc2c MDL-67296 core_h5p: tests modified to use exttests 2020-01-22 20:41:23 +00:00
Víctor Déniz Falcón b80d4a6b26 MDL-67296 core_h5p: minor changes
core.php-Avoid to use the factory for each content type
h5p_get_content_types_task-new method to simplify test execution
framework.php-returns error if you get a 404 response after requesting a file
2020-01-22 18:56:38 +00:00
Jun Pataleta c4e6d74577 Merge branch 'MDL-66897-38-1' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2020-01-22 23:17:05 +08:00
Mihail Geshoski ac32e20ada MDL-66897 mod_assign: Properly display error messages in quick grading 2020-01-22 14:02:59 +08:00
Adrian Greeve 37821e0918 Merge branch 'MDL-67424-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-01-22 13:57:53 +08:00
Adrian Greeve b1e2c36330 Merge branch 'MDL-67653_38' of https://github.com/timhunt/moodle into MOODLE_38_STABLE 2020-01-22 11:04:09 +08:00
Adrian Greeve 4ea5ab220a Merge branch 'MDL-67660-38-v2' of https://github.com/TobiGa/moodle into MOODLE_38_STABLE 2020-01-22 10:42:24 +08:00
Jun Pataleta f2955fae89 Merge branch 'MDL-67684-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-22 10:38:02 +08:00
Adrian Greeve 0206502461 Merge branch 'MDL-67680-38' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2020-01-22 10:30:05 +08:00
Colin Campbell b4779307a2 MDL-52189 file: skip deleting temp files that appear during cleanup 2020-01-22 12:09:50 +10:00
Adrian Greeve 4ff40b48e7 Merge branch 'MDL-67656-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-22 09:45:58 +08:00
Eloy Lafuente (stronk7) 830ef192ad Merge branch 'MDL-66858_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-22 01:57:28 +01:00
Michael Milette 8b466d2803 MDL-66858 master: Enable <header> tags in Atto editor.
(amended to add the src/editor/js/clean.js
file that was originally missing)
2020-01-22 00:06:14 +01:00
Eloy Lafuente (stronk7) bd290493b1 Merge branch 'MDL-51225-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-21 23:40:16 +01:00
Adrian Greeve 6e6b973f0a Merge branch 'MDL-66237-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2020-01-21 11:20:32 +08:00
Jun Pataleta 43b39b0ce9 Merge branch 'MDL-66108-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-01-21 09:50:56 +08:00
Eloy Lafuente (stronk7) 7523e0c352 Merge branch 'MDL-66024-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-01-20 22:48:27 +01:00
Eloy Lafuente (stronk7) 77234ad1ef Merge branch 'MDL-66220-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-20 22:34:17 +01:00
Eloy Lafuente (stronk7) 132809e8ff Merge branch 'MDL-66712-38-selfautounenrol' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2020-01-20 22:29:00 +01:00
Paul Holden e53dadd3a1 MDL-65884 filters: update exclusive separator characters for tags.
The previous characters mangled the output of filtered text, exhibited
in the activity names filter for activities named '-' (single hyphen).
2020-01-20 20:55:34 +01:00
David Mudrák 7b6f691f3d MDL-64531 course: Add Behat test for deleting a quiz with own questions
Teachers can delete Quiz activities that have a question in their own
context via AJAX request with the course recycle bin disabled. This used
to lead to "Unexpected token < in JSON" because of the extra HTML in the
output.
2020-01-20 18:20:27 +01:00
Tim Hunt 596cbeb955 MDL-64531 course: course_delete_module shouldn't output during AJAX
Committer's note: This change was originally part of a bigger patchset
submitted by the author. This is a stripped-down version that does not
use phpunit tests for the new behaviour.
2020-01-20 18:07:17 +01:00
Eloy Lafuente (stronk7) 4a617ad4c6 Merge branch 'MDL-67724-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-20 10:53:28 +01:00
Sara Arjona 9ef53aba3a Merge branch 'MDL-67312-38' of git://github.com/lameze/moodle into MOODLE_38_STABLE 2020-01-20 08:03:52 +01:00
Adrian Greeve 288d4fc575 Merge branch 'MDL-66761-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2020-01-20 14:47:30 +08:00
Adrian Greeve 68fd5cfaf4 Merge branch 'MDL-67583-38' of https://github.com/KietChan/moodle into MOODLE_38_STABLE 2020-01-20 13:38:14 +08:00
Simey Lameze df6160f8a1 MDL-67312 core_user: clean subs events on user deletion 2020-01-20 08:50:55 +08:00
Simey Lameze 7434f3abf3 MDL-67312 calendar: upgrade step to delete orphaned events 2020-01-20 08:50:51 +08:00
Simey Lameze abaf1375c1 MDL-67312 core: change db upgrade step to use get_fieldset_sql 2020-01-20 08:47:34 +08:00
Eloy Lafuente (stronk7) 646e72349d MDL-67691 behat: inform about the_following_exist() removal
behat_data_generators::the_following_exist() has been removed, please use
behat_data_generators::the_following_entities_exist() instead.

See MDL-67691 for more info.
2020-01-20 00:11:57 +01:00
Eloy Lafuente (stronk7) 7781e1e2bf MDL-67115 google: php74 params order for implode()
Passing parameters to implode() in reverse order is deprecated, use
implode($glue, $parts) instead of implode($parts, $glue).

This commit corresponds to general search of wrong cases.
2020-01-19 18:49:24 +01:00
Eloy Lafuente (stronk7) 41f06cfc92 MDL-67115 htmlpurifier: php74 params order for implode()
Passing parameters to implode() in reverse order is deprecated, use
implode($glue, $parts) instead of implode($parts, $glue).

This commit corresponds to general search of wrong cases.
2020-01-19 18:49:24 +01:00
Eloy Lafuente (stronk7) 903428a532 MDL-67115 minify: php74 params order for implode()/join()
Passing parameters to implode() in reverse order is deprecated, use
implode($glue, $parts) instead of implode($parts, $glue).

This commit corresponds to phpunit detections, minify library.
2020-01-19 18:49:23 +01:00
Eloy Lafuente (stronk7) 20c78476a3 MDL-67115 core: php74 params order for implode()/join()
Passing parameters to implode() in reverse order is deprecated, use
implode($glue, $parts) instead of implode($parts, $glue).

This commit corresponds to phpunit and manual detections, core files.
2020-01-19 18:49:23 +01:00
Adrian Perez 63b7cd9927 MDL-67626 assign: fix view full/view summary control in IE 2020-01-18 14:16:07 +01:00
AMOS bot dc89ea0e88 Automatically generated installer lang files 2020-01-18 00:10:49 +00:00
fdallet 52136af780 MDL-65952 mod_scorm: Fix unwanted changes to require status 2020-01-17 17:29:36 +01:00
Paul Holden 7b0a8e09c0 MDL-66108 course: fix false positives when bulk moving categories. 2020-01-17 16:19:17 +00:00
Jun Pataleta 13a34d0aa7 MDL-67724 mod_glossary: Improve Behat test
Improve the "Glossary entries are not always editable" scenario by:
* No need to use the @javascript tag
* The maxediting time can be set to a lower value to
reduce the overall wait time.
2020-01-17 17:50:11 +08:00
Tobias Garske a6a79e25f4 MDL-67660 core_message: Messages search change input focus 2020-01-17 09:40:18 +01:00
Michael Hawkins 511dc1cd96 MDL-67722 mod_forum: Reduce wait time on time limit expires behat test 2020-01-17 15:46:45 +08:00
Jun Pataleta df7cacee50 MDL-51225 mod_forum: Use can_view_post to determine whether to show post
Use \mod_forum\local\managers\capability::can_view_post() to
consistently determine whether a forum post will be rendered in the
recent activity block.
This helps the recent activity block to provide a more consistent
behaviour with the forum's discussion view itself.
2020-01-17 14:45:50 +08:00
Jun Pataleta 994ec1690d MDL-51225 mod_forum: Create behat tests for forum recent activity 2020-01-17 14:45:50 +08:00
Jun Pataleta b92880fd4a MDL-51225 mod_forum: New behat step for creating question discussion 2020-01-17 14:45:50 +08:00
Michael Hawkins 27557f1a55 MDL-66761 forumreport_summary: Added groups filter behat testing 2020-01-17 10:35:37 +08:00
Michael Hawkins 58c1af595e MDL-66761 mod_forum: Behat support group ID in bulk discussion adding 2020-01-17 10:35:37 +08:00
AMOS bot 4c495c2aa3 Automatically generated installer lang files 2020-01-17 00:12:19 +00:00
Eloy Lafuente (stronk7) 86362a7fb2 MDL-67118 enrol_ldap: add pagesize/subcontexts provider
With that provider we'll be explicitly checking that any
pagesize and subcontexts search is returning results consistently
so the internal paging/servercontrols work as expected.
2020-01-16 19:16:21 +01:00
Eloy Lafuente (stronk7) f8b9cc01c3 MDL-67118 enrol_ldap: paged results functions deprecated php74 and up
Starting with php74 the following functions are deprecated:
- ldap_control_paged_result()
- ldap_control_paged_result_response()

Starting with php73, ldap servercontrols were included. One of those
servercontrols, LDAP_CONTROL_PAGEDRESULTS, is the one in charge of
controlling paged results.

So, we are going to add some conditional code here:

1) if php < 7.3, use old paged result functions.
2) if php >= 7.3, switch to LDAP_CONTROL_PAGEDRESULTS servercontrol.

With a TODO about removing 1) in Moodle 4.1, once php73 becomes required.
2020-01-16 19:16:21 +01:00
Eloy Lafuente (stronk7) 19e3cdbad9 MDL-67118 auth_ldap: add pagesize/subcontexts test provider
With that provider we'll be explicitly covering that any
pagesize and subcontexts search is returning results consistently
so the internal paging/servercontrols work as expected.
2020-01-16 19:16:21 +01:00
Eloy Lafuente (stronk7) bcf7349371 MDL-67118 auth_ldap: paged results functions deprecated php74 and up
Starting with php74 the following functions are deprecated:
- ldap_control_paged_result()
- ldap_control_paged_result_response()

Starting with php73, ldap servercontrols were included. One of those
servercontrols, LDAP_CONTROL_PAGEDRESULTS, is the one in charge of
controlling paged results.

So, we are going to add some conditional code here:

1) if php < 7.3, use old paged result functions.
2) if php >= 7.3, switch to LDAP_CONTROL_PAGEDRESULTS servercontrol.

With a TODO about removing 1) in Moodle 4.1, once php73 becomes required.
2020-01-16 19:16:21 +01:00
Sara Arjona 36984d4d1d weekly release 3.8.1+ 2020-01-16 17:19:21 +01:00
Sara Arjona bcb56b9071 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-01-16 17:19:19 +01:00
David Mudrák 82505a878b MDL-66712 enrol: Fix the reported days of inactivity on unenrolment
There were two problems here. Firstly, the $days was not correctly
calculated due to missing parentheses. Secondly, the sentence had
grammar issues.
2020-01-16 13:44:22 +01:00
Jun Pataleta 8e45839933 MDL-66220 mod_forum: Prevent from replying to a post the user can't see 2020-01-16 15:06:11 +08:00
Jun Pataleta e1eea0cf36 MDL-66220 mod_forum: Cache result of forum_user_can_see_post()
* Cache the result of this function to avoid doing multiple DB calls
for the same post when loading posts in a discussion.
2020-01-16 15:06:11 +08:00
Jun Pataleta cf32c9116b MDL-66220 mod_forum: Additional unit test for can_reply_to_post 2020-01-16 15:06:11 +08:00
Andrew Nicols cdf31c3d57 Merge branch 'wip-MDL-66918-38stable' of https://github.com/Beedell/moodle into MOODLE_38_STABLE 2020-01-16 11:43:18 +08:00
Eloy Lafuente (stronk7) 0c01f98410 Merge branch 'MDL-67625-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-01-16 00:26:57 +01:00
Sara Arjona e7721e50c6 Merge branch 'MDL-67379-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-01-15 22:12:41 +01:00
Eloy Lafuente (stronk7) 8f112b1064 Merge branch 'MDL-67622_38' of git://github.com/dmonllao/moodle into MOODLE_38_STABLE 2020-01-15 18:55:55 +01:00
Shamim Rezaie 65fcabe132 MDL-67424 mod_forum: error on complete report when no rating or grade 2020-01-16 03:17:52 +11:00
Shamim Rezaie 2c76c1893f MDL-67424 report_outline: behat user report with a no-grade forum 2020-01-16 03:17:52 +11:00
Shamim Rezaie e27ac65f3d MDL-67379 libraries: Upgrade scssphp to 1.0.6 2020-01-16 00:26:47 +11:00
Sara Arjona 3d8f92e4be Merge branch 'MDL-67617-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2020-01-15 12:43:10 +01:00
Sara Arjona 35fd550dc9 Merge branch 'MDL-67638-38' of https://github.com/nguyenphuctien/moodle into MOODLE_38_STABLE 2020-01-15 12:19:44 +01:00
Andrew Nicols 712b21c6e7 Merge branch 'MDL-67486-swap-cron-lock-MOODLE_38_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_38_STABLE 2020-01-15 13:53:56 +08:00
Mark Johnson b5410980aa MDL-67674 Cache: Lock rebuilding of the course category tree cache 2020-01-15 00:02:06 +01:00
Sara Arjona b2c6ab2d0a Merge branch 'MDL-65573-38-2' of git://github.com/peterRd/moodle into MOODLE_38_STABLE 2020-01-14 12:20:09 +01:00
Andrew Nicols 4fb25b5b6c Merge branch 'MDL-66721-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2020-01-14 14:09:42 +08:00
Andrew Nicols 3467ce09c8 MDL-67684 core: Add missing li tag 2020-01-14 08:47:08 +08:00
Andrew Nicols 83d4daee8d Merge branch 'MDL-35971-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-14 08:32:14 +08:00
AMOS bot e653281d4a Automatically generated installer lang files 2020-01-14 00:10:24 +00:00
Peter 03b372b804 MDL-65573 mod_forum: Set userid properly after split
* Set the discussion's userid properly when splitting a discussion.
* Update step to correct existing incorrect records.
2020-01-14 07:37:41 +08:00
Eloy Lafuente (stronk7) c1724722c8 Merge branch 'MDL-65649-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-01-13 18:56:52 +01:00
Eloy Lafuente (stronk7) d1b3b4af95 Merge branch 'MDL-65987-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-13 18:37:30 +01:00
Marina Glancy f9a80888bc MDL-67680 core: Catch PHP exceptions in the after_config callback 2020-01-13 17:01:27 +01:00
Sara Arjona 0ebf9b16ea Merge branch 'MDL-59817-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-13 14:26:49 +01:00
Kiet.Chan 01fd8ac565 MDL-67583 themes: Popover placement should react to scroll event 2020-01-13 17:29:46 +07:00
Bas Brands 80a5640ed2 MDL-67472 theme_boost: configurable sass variable for drawer bgcolour 2020-01-13 09:16:36 +01:00
Tien Nguyen Phuc decf6b62ae MDL-67638 Course: update course timemodified on bulk category move 2020-01-13 10:42:06 +07:00
Andrew Nicols 5b31655420 Merge branch 'MDL-67204-38' of https://github.com/mwehr/moodle into MOODLE_38_STABLE 2020-01-13 08:53:56 +08:00
Brendan Heywood 8e725dd819 MDL-67486 cron: Improve throughput by holding cron lock for less time 2020-01-12 00:45:02 +11:00
Tim Hunt d0c48cd693 MDL-67653 questions: prevent the flag flickering as the page loads 2020-01-10 14:28:16 +00:00
Andrew Nicols b2f13181ec MDL-59817 atto_accessibilitychecker: Handle transparency properly
Some browsers, notably Firefox, do not return the computed style for
background colour in a computed RGB format. Instead they return the RGBA
where the alpha channel is set to fully transparent.

To solve this we need to work up the hierarchy and compute the
background colour for each parent node until we reach full alpha (1).

We can use a standard calculation to approximate the value for the
resultant element background by multiplying the alpha of the current
transparent (or semi-transparent) node with the R, G, or B channel in
question, and that of the parent node's background colour.

There are cases where this will not be 100% accurate - notably where
there is some additional content in addition to the parent background,
but this gives us a reasoable approximation for the majority of cases.
Additionally the code has never considered the full set of node content
when calculating this information.
2020-01-10 15:26:51 +08:00
Andrew Nicols fcdc318982 MDL-67656 behat: Removed nested spin 2020-01-10 13:37:43 +08:00
Andrew Nicols c89d25a046 MDL-67656 behat: Fix usleep call in spin 2020-01-10 13:37:36 +08:00
Andrew Nicols 77be1e3fe3 Moodle release 3.8.1 2020-01-10 13:03:44 +08:00
Andrew Nicols de7b3e37b3 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-01-10 13:03:42 +08:00
AMOS bot ffd8dfcf27 Automatically generated installer lang files 2020-01-10 00:12:13 +00:00
Luca Bösch b116f84589 MDL-67625 quiz: only section titles should be large when editing. 2020-01-09 17:23:11 +01:00
Luca Bösch 36e70e664b MDL-67617 gradereport_singleview: Style the form element with bs classes 2020-01-09 17:22:18 +01:00
Mario Wehr 0debc8f826 MDL-67204 assign task: Use lastruntime from task_scheduled 2020-01-09 17:11:20 +01:00
John Beedell 81801a0685 MDL-66918 behat: Behat app step failing 2020-01-09 15:57:27 +00:00
Sara Arjona 8a82f51043 weekly release 3.8+ 2020-01-09 15:42:53 +01:00
Jun Pataleta 68cab31dba Merge branch 'MDL-67544-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-09 15:22:35 +08:00
Andrew Nicols 3f50c24fc3 MDL-67544f= mod_forum: Correct "for" attribute on private checkbox 2020-01-09 14:55:52 +08:00
Andrew Nicols 9973646ca7 MDL-67544 mod_forum: Ensure post actions menu id is unique 2020-01-09 14:09:21 +08:00
Andrew Nicols f14420c739 Merge branch 'MOODLE_38_MDL-67485' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2020-01-09 12:40:19 +08:00
Mikhail Golenkov 70868d8648 MDL-67485 task: Release the task runner lock before throwing exception. 2020-01-09 14:49:38 +11:00
Andrew Nicols 8f45c9b6a5 Merge branch 'MDL-67596-cron-ramp-up-MOODLE_38_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_38_STABLE 2020-01-09 09:32:49 +08:00
Brendan Heywood 1f5c6c6b7a MDL-67596 cron: Allow runners to ramp up instantly 2020-01-09 11:07:19 +11:00
Eloy Lafuente (stronk7) 26999dda23 Merge branch 'MDL-67544-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2020-01-08 16:35:32 +01:00
Eloy Lafuente (stronk7) 022206f2fe Merge branch 'MDL-67533-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-08 16:31:18 +01:00
Jake Dallimore f9e0f61467 MDL-67637 core_message: only preview lastmessage text if safe to do so
If any html/script tags are found in the text() value, don't display it.
2020-01-08 12:31:17 +01:00
Jun Pataleta c07bc83480 MDL-67533 mod_forum: Remove duplicate Re in experimental view subject 2020-01-08 16:29:43 +08:00
Jun Pataleta de2238985d MDL-35971 mod_forum: Add proper discussion list table description 2020-01-08 16:04:20 +08:00
Sara Arjona 7d7d3520a7 Merge branch 'MDL-67417-38' of https://github.com/KietChan/moodle into MOODLE_38_STABLE 2020-01-08 08:26:44 +01:00
Andrew Nicols f34f8131ba MDL-67544 mod_forum: Ensure that private reply checkbox has unique id 2020-01-08 15:26:03 +08:00
Sara Arjona 85ba5d1d88 Merge branch 'MDL-67510-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-08 08:11:01 +01:00
Andrew Nicols e0b8a3b17a Merge branch 'MDL-64764-38' of git://github.com/paulholden/moodle into MOODLE_38_STABLE 2020-01-08 08:30:33 +08:00
Eloy Lafuente (stronk7) 5577e472e5 Merge branch 'MDL-67469-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2020-01-07 22:59:51 +01:00
Marina Glancy 571f508d4e MDL-64764 core_admin: allow to submit empty list of allowed roles.
Co-authored-by: Paul Holden <paulh@moodle.com>
2020-01-07 10:01:33 +00:00
Andrew Nicols 764ec8d7fb Merge branch 'MDL-65849-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2020-01-07 13:26:56 +08:00
Andrew Nicols eb04dc8792 Merge branch 'MDL-66938-38' of https://github.com/grabs/moodle into MOODLE_38_STABLE 2020-01-07 12:49:42 +08:00
Paul Holden 2f19ac90c6 MDL-66237 message_popup: Get redirecturl from notification contexturl 2020-01-07 11:18:24 +08:00
Andrew Nicols 6fefb88819 MDL-67114 mod_wiki: Whitespace fix 2020-01-07 11:05:02 +08:00
Andrew Nicols 1b2a8dad89 Merge branch 'MDL-67114_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-07 11:04:55 +08:00
Andrew Nicols ec63d3eab4 Merge branch 'MDL-66871-38-v2' of git://github.com/lameze/moodle into MOODLE_38_STABLE 2020-01-07 08:54:44 +08:00
Bas Brands 63052bffb0 MDL-66721 core_chooser: height correction for chooser modal 2020-01-06 10:13:12 +01:00
Andrew Nicols 5f4250dc43 MDL-67544 form: Ensure that form errors have a unique id 2020-01-06 15:01:07 +08:00
Andrew Nicols b024306e5c MDL-67544 mod_forum: Add missing label for discussion move 2020-01-06 15:01:07 +08:00
Andrew Nicols 0d285e9334 MDL-67544 mod_forum: Add missing menuitem roles 2020-01-06 15:01:07 +08:00
Andrew Nicols bed212f61b MDL-67544 mod_forum: Correct aria-labelledby node 2020-01-06 15:01:07 +08:00
Andrew Nicols 14d58697a3 MDL-67544 mod_forum: Correct aria-controls to point to valid node 2020-01-06 15:01:07 +08:00
Andrew Nicols e98103354d MDL-67544 mod_forum: Add missing aria label for grade search 2020-01-06 15:01:07 +08:00
Andrew Nicols d8dfb98417 MDL-67544 core: Ensure unique IDs for YUI dialogues 2020-01-06 15:01:07 +08:00
Andrew Nicols 3684d9e03c MDL-67544 theme: Ensure that search box is in valid li 2020-01-06 15:01:06 +08:00
Andrew Nicols 629ef7772f MDL-67544 mod_forum: Add default role for favourite toggle 2020-01-06 15:01:06 +08:00
Andrew Nicols 9e57c09d7b MDL-67544 mod_forum: Add missing aria label for discussion actions 2020-01-06 15:01:06 +08:00
Andrew Nicols 949d3f1c02 MDL-67544 mod_forum: Correct aria-role => aria-live 2020-01-06 15:01:06 +08:00
Andrew Nicols 11524653b0 MDL-67544 mod_forum: Correct aria-role => role 2020-01-06 15:01:06 +08:00
David Monllaó 74299cd64b MDL-67622 mlbackend_python: Fix f1score calculation 2020-01-06 13:16:38 +08:00
Jun Pataleta f9b2f6634d MDL-67510 tool_dataprivacy: Fix the reply-to name of the privacy officer 2020-01-06 11:36:49 +08:00
Simey Lameze dafe4c5a78 MDL-66871 calendar: fix deprecated parameter in the phpDoc 2020-01-06 10:42:22 +08:00
Simey Lameze 550c4e1c42 MDL-66871 calendar: add unit test coverage for ics importing 2020-01-06 10:42:22 +08:00
Simey Lameze 0287928c4b MDL-66871 calendar: fix ics importing logic 2020-01-06 10:42:22 +08:00
Luca Bösch 50bcb24e09 MDL-65987 mod_forum: Add string 'Advanced' for the advanced editor.
AMOS BEGIN
    CPY [advanced,moodle],[showadvancededitor,moodle]
   AMOS END
2020-01-06 09:41:51 +08:00
Jake Dallimore 701d27e5d9 Merge branch 'MDL-67336-38' of https://github.com/roland04/moodle into MOODLE_38_STABLE 2020-01-06 09:36:53 +08:00
Andreas Grabs 13d5d3edb1 MDL-66938 mod_feedback: Export includes unwanted html in field names 2020-01-05 19:33:27 +01:00
Eloy Lafuente (stronk7) abc8f149ce MDL-67114 core: php74 fix. Fix use of scalar as array in core
There are various places where it's not guaranteed that the
variable being used is array, and instead, can be null, bool, int...

We need to check that because php74 warns about it.

Where possible we have used the coalesce operator as
replacement for isset() ternary operations.
2020-01-03 11:33:23 +01:00
Eloy Lafuente (stronk7) c3a6437220 MDL-67114 scssphp: php74 compatibility local fixes
Note they are already available upstream, versions 1.0.4 and up so,
in next upgrade they will be fixed.
2020-01-03 11:33:23 +01:00
Eloy Lafuente (stronk7) c910982c49 MDL-67114 mustache: php74 fix. Fix use of scalar as array
Trying to use values of type null, bool, int, float or resource as an
array (such as $null["key"]) will now generate a notice. This does not
affect array accesses performed by list().

RFC: https://wiki.php.net/rfc/notice-for-non-valid-array-container
2020-01-03 11:33:23 +01:00
Jake Dallimore 4d5849b0e4 weekly release 3.8+ 2020-01-03 11:25:08 +08:00
Jake Dallimore cc0b18ec0e Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2020-01-03 11:25:05 +08:00
AMOS bot 3c7ebda9a5 Automatically generated installer lang files 2020-01-03 00:12:10 +00:00
Adrian Greeve 19401adbdd Merge branch 'MDL-67599-38' of https://github.com/snake/moodle into MOODLE_38_STABLE 2020-01-02 15:16:18 +08:00
Jake Dallimore a7fb29a8ff MDL-67599 behat: fix behat tests assuming Jan 2020 is a future date 2020-01-02 13:52:24 +08:00
Jake Dallimore c53861fd66 Merge branch 'MDL-67598_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2020-01-02 10:19:30 +08:00
AMOS bot 88d4a01089 Automatically generated installer lang files 2020-01-02 00:10:23 +00:00
Eloy Lafuente (stronk7) b71e7b79e8 MDL-67598 unit tests: Pass day of month without leading zero
Note this fixes the unit tests. Still the calendar API itself
should be able to manage this cases, both casting (int) or
being stricter about what's allowed there (param hinting).

But that falls out from this issue and the code that introduced
the failures, so the pure unit-test fix has been applied.
2020-01-02 00:10:16 +01:00
Eloy Lafuente (stronk7) 6c7199a426 Merge branch 'MDL-67593-38' of https://github.com/snake/moodle into MOODLE_38_STABLE 2019-12-31 10:50:41 +01:00
Jake Dallimore 827f3cd471 MDL-67593 core_iplookup: update lang string describing download process
Let users know they need to register on maxmind before granted download
access.
2019-12-31 15:54:33 +08:00
Jake Dallimore 0260074ba1 MDL-67593 core_iplookup: use MaxMind test database in unit tests
Instead of downloading a live database (now not available publicly)
use a local test database.
2019-12-31 15:54:27 +08:00
Jun Pataleta edab811944 Merge branch 'MDL-63996-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2019-12-31 15:19:17 +08:00
Jun Pataleta 348ceb4631 Merge branch 'MDL-67487-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2019-12-31 11:55:55 +08:00
Jun Pataleta 5544dc1cc7 Merge branch 'MDL-67470-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2019-12-31 11:29:52 +08:00
Bas Brands c02d168cd7 MDL-67470 theme_boost: settings_menu_proxy correct background
the .region_main_settings_proxy was introduced in MDL-56582 using the
wrong bootstrap variable for the background color
2019-12-31 09:59:51 +08:00
Adrian Greeve 53fde6278a Merge branch 'MDL-67233-38' of git://github.com/peterRd/moodle into MOODLE_38_STABLE 2019-12-30 12:56:59 +08:00
Jun Pataleta 25221f73a6 Merge branch 'MDL-67491-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2019-12-30 12:41:40 +08:00
Didier 'OdyX' Raboud b901252f6d MDL-67491 core_message: Primary'fy the contact request counts 2019-12-30 11:47:36 +08:00
Eloy Lafuente (stronk7) be73a0ed4e Merge branch 'MDL-67523-38' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2019-12-29 23:32:07 +01:00
Eloy Lafuente (stronk7) e654258446 Merge branch 'MDL-67527-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2019-12-29 23:27:13 +01:00
Adrian Greeve 8c14984028 Merge branch 'MDL-63107-38' of git://github.com/bmbrands/moodle into MOODLE_38_STABLE 2019-12-27 16:34:10 +08:00
Adrian Greeve dd6bbf3962 Merge branch 'MDL-65809-38-onlyenv' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2019-12-24 14:54:57 +08:00
Adrian Greeve 01e84ac720 Merge branch 'MOODLE_38_STABLE-MDL-67524' of https://github.com/yao9394/moodle into MOODLE_38_STABLE 2019-12-23 10:30:23 +08:00
John Yao b423c5ad38 MDL-67524 book: fixing view hidden chapter issue
* Users who has permission should be able to view after turning editing off
2019-12-23 09:48:31 +11:00
AMOS bot f70cc95a13 Automatically generated installer lang files 2019-12-21 00:10:57 +00:00
Luca Bösch d9887f7350 MDL-67487 forms: align "Custom" checkbox for course section name. 2019-12-20 13:48:48 +01:00
Eloy Lafuente (stronk7) f2db42f921 weekly release 3.8+ 2019-12-20 11:02:10 +01:00
Eloy Lafuente (stronk7) b85896f7bc NOBUG: Fixed SVG browser compatibility 2019-12-20 11:02:08 +01:00
Eloy Lafuente (stronk7) 6350a758d7 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2019-12-20 11:02:07 +01:00
Eloy Lafuente (stronk7) a3ea0db227 Merge branch 'MDL-67151-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2019-12-19 23:01:23 +01:00
Shamim Rezaie cd62c520e2 MDL-67151 qtype_numerical: convert the tolerance to string before saving
Fix the sqlserver issue when saving a number into a text field
2019-12-20 01:20:12 +11:00
Marina Glancy 86d4aca10d MDL-67523 core_admin: do not require admin to view category
Revert changes from MDL-58439 (in this file only)
2019-12-19 10:15:10 +01:00
Jun Pataleta 40ba9d9cfa Merge branch 'MOODLE_38_STABLE_MDL-63795_core_setting_defaults' of https://github.com/mattporritt/moodle into MOODLE_38_STABLE 2019-12-19 11:17:41 +08:00
Matt Porritt 5c510b92e2 MDL-63795 Administration: CLI upgrade apply all settings
This patch fixes a regression caused by MDL-62777.  MDL-62777 added output to inform
administrators of new default settings.  However, the recursion in the code did not
handle new settings made available as the result of the defaults of other settings
being set.
This patch fixes the issue, now all defaults are correctly set, even those exposed
after other defaults are set.
2019-12-19 12:22:01 +11:00
Eloy Lafuente (stronk7) 754ecb5768 Merge branch 'MDL-67151-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2019-12-18 23:05:56 +01:00
David Mudrák e7a122bba9 MDL-67527 lang: Propagate the string fixes to Behat and other places 2019-12-18 21:22:15 +01:00
Helen Foster 13edb4f9f9 MDL-67527 lang: Import fixed English strings (en_fix) 2019-12-18 21:22:15 +01:00
Eloy Lafuente (stronk7) db394d5b08 Merge branch 'MDL-64695-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2019-12-18 19:56:10 +01:00
Eloy Lafuente (stronk7) d18802eb2f Merge branch 'MDL-67464-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2019-12-17 19:37:00 +01:00
Mikel Martín ead3a41240 MDL-67336 mod_forum: Fixing forum inline reply filtering before saving 2019-12-17 11:59:02 +01:00
Jake Dallimore ae7b1be0b6 Merge branch 'MDL-67304_38' of git://github.com/dmonllao/moodle into MOODLE_38_STABLE 2019-12-17 13:47:11 +08:00
Jake Dallimore cca393d2f6 Merge branch 'MDL-65735-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE 2019-12-17 13:25:24 +08:00
Eloy Lafuente (stronk7) 69430157a3 Merge branch 'MDL-67522-38' of git://github.com/marinaglancy/moodle into MOODLE_38_STABLE 2019-12-17 00:22:33 +01:00
Eloy Lafuente (stronk7) f077d9fbea Merge branch 'MDL-67410-38' of https://github.com/felicemcc/moodle into MOODLE_38_STABLE 2019-12-16 19:18:31 +01:00
Bas Brands 8c20e76d43 MDL-63107 mod_book: rewrite styles for book chapter block
* using flexbox to position titles
* fix for title overlap on edit mode
* show correct bullets, number or indent
2019-12-16 13:30:28 +01:00
Jake Dallimore a0ac535549 Merge branch 'MDL-67327-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE 2019-12-16 15:12:35 +08:00
Andrew Nicols 11260d5f3f MDL-63996 core/tags: Pending JS for all tag code 2019-12-16 14:03:46 +08:00
Andrew Nicols 67fc9943b9 MDL-63996 behat: Fix multi-tag autocomplete usage 2019-12-16 14:00:04 +08:00
Jake Dallimore 29a5f6eaa2 Merge branch 'MDL-66503-38' of git://github.com/abgreeve/moodle into MOODLE_38_STABLE 2019-12-16 09:11:33 +08:00
Marina Glancy a6fd7ada34 MDL-67522 core_lock: fix mistype in config-dist 2019-12-14 19:29:40 +01:00
AMOS bot c86c872db3 Automatically generated installer lang files 2019-12-14 00:10:53 +00:00
Jun Pataleta 7b4848ca80 MDL-67469 tool_dataprivacy: Put back missing test code
This patch simply brings back the missing test code for
\tool_dataprivacy_api_testcase::test_approve_data_request_non_dpo_user()
2019-12-13 10:05:24 +08:00
AMOS bot d9e3c11834 Automatically generated installer lang files 2019-12-13 00:11:09 +00:00
Felice Candilio 1437e35d2d MDL-67410 Enrolments: Cast the perpage parameter to integer in JS
The parameter called "perpage" on the call is treated as a string,
therefore, It could have a value 15001 resulting from a "+" operation
of the "1500" string and the number 1. That big number makes
the AJAX call extremely slow.

The proposed solution is to parse the number as an integer
when performing the addition.
2019-12-12 22:25:55 +01:00
Paul Holden 914d5ab82d MDL-65735 report_progress: reset URL start parameter in initials bars. 2019-12-12 18:24:12 +00:00
Paul Holden fbf0c8810b MDL-64695 tool_dataprivacy: filter site fullname in outgoing messages. 2019-12-12 18:20:22 +00:00
Paul Holden 25da0b49ea MDL-64695 privacy: filter site fullname in data export. 2019-12-12 18:20:22 +00:00
Sara Arjona 70e47fdc2a MDL-67464 core_h5p: use h5p.com URLs in behat tests
The H5P content used in behat for validating external URLs
behaviour shouldn't point h5p.org because it may stop working
(it's not for real content). These content have been moved to
moodle.h5p.com (payment account).
Besides, the scenarios loading content from external URLs
have been labelel with @external.
2019-12-12 16:07:17 +01:00
Eloy Lafuente (stronk7) 3bfdc05d3a weekly release 3.8+ 2019-12-12 13:26:31 +01:00
Eloy Lafuente (stronk7) d64a94713e NOBUG: Fixed SVG browser compatibility 2019-12-12 13:26:29 +01:00
Eloy Lafuente (stronk7) 8d7f1fd428 Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE 2019-12-12 13:26:28 +01:00
Andrew Nicols a7268b4f8a MDL-67327 js: Make requirejs.php more fault tolerant 2019-12-12 16:37:08 +08:00
Jake Dallimore 4792cc508e Merge branch 'MDL-67154-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2019-12-12 09:05:11 +08:00
Ferran Recio 7bc625d846 MDL-67154 theme_classic: fixing firefox printing 2019-12-11 16:57:36 +01:00
AMOS bot 6dc25cc165 Automatically generated installer lang files 2019-12-11 13:50:07 +00:00
AMOS bot 747000a2fe Automatically generated installer lang files 2019-12-11 13:50:07 +00:00
Kiet.Chan bec0808b18 MDL-67417 theme_boost: Tooltip icon stop working after closing using ESC 2019-12-11 15:00:14 +07:00
Andrew Nicols 7f40272535 Merge branch 'MDL-67458-38' of https://github.com/snake/moodle into MOODLE_38_STABLE 2019-12-11 10:27:19 +08:00
Jake Dallimore f9735bbde7 MDL-67458 core: removing stale cohortroles and role assignments 2019-12-11 09:36:54 +08:00
Jake Dallimore 4dc1413cc7 MDL-67458 tool_cohortroles: remove role mapping for deleted roles
Before syncing anything, clean up records pointing to deleted roles.
2019-12-11 09:36:15 +08:00
Adrian Greeve 79b6a4acac MDL-66503 themes: Set the embed page to display block. 2019-12-11 09:32:54 +08:00
Andrew Nicols cf50c5f1cb Merge branch 'MDL-67434-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2019-12-10 17:29:02 +08:00
Marina Glancy fc74a6e6d2 MDL-66936 mod_url: revert MDL-65024 adding fullurl to modinfo
This reverts commit cc56e409c3, reversing
changes made to 01cdf16c0e.
2019-12-10 15:27:59 +08:00
Jonathon Fowler a48bd1c4e3 MDL-66936 url: fix error when modinfo cache is rebuilt non-interactively 2019-12-10 15:27:52 +08:00
Jake Dallimore ee215ddd43 Merge branch 'MDL-67179-38' of git://github.com/Chocolate-lightning/moodle into MOODLE_38_STABLE 2019-12-10 15:03:24 +08:00
Mathew May f3e7533b9d MDL-67179 core: Add missing grading pix 2019-12-10 14:38:55 +08:00
Andrew Nicols 921469db8f Merge branch 'MDL-67277-38-strongtopics' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE 2019-12-10 12:49:18 +08:00
Jake Dallimore b99f2bce77 Merge branch 'MDL-67154-38' of git://github.com/ferranrecio/moodle into MOODLE_38_STABLE 2019-12-10 11:53:56 +08:00
Jake Dallimore 7df9eb36cd Merge branch 'MDL-67451-38' of git://github.com/sarjona/moodle into MOODLE_38_STABLE 2019-12-10 10:37:15 +08:00
Jake Dallimore aee09a6357 Merge branch 'MDL-66708-MOODLE_38_KeyGenCache' of https://github.com/Cengage/moodle into MOODLE_38_STABLE 2019-12-10 09:12:13 +08:00
David Monllaó 8ae7a4ad68 MDL-67304 analytics: Add missing png svg incorrect icon
Credit to jaked for the icons and the testing instructions
2019-12-10 09:01:43 +08:00
Andrew Nicols d911548cf4 Merge branch 'MDL-67152-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2019-12-10 08:21:20 +08:00
Paul Holden 7a4b6df0fe MDL-65649 backup: ensure valid course URL for async mode. 2019-12-09 23:34:30 +00:00
Shamim Rezaie c8435454a7 MDL-67152 calendar: The day view should start from the current day 2019-12-10 06:58:18 +11:00
Jake Dallimore df2bda2f00 Merge branch 'MDL-67392-38' of git://github.com/rezaies/moodle into MOODLE_38_STABLE 2019-12-09 14:46:56 +08:00
Andrew Nicols bf52b2a3bc Merge branch 'MDL-60975-38' of https://github.com/Kathrin84/moodle into MOODLE_38_STABLE 2019-12-09 13:12:59 +08:00
Frédéric Massart f130c810f9 MDL-67434 javascript: Use static get_string after recycling promise 2019-12-09 10:12:43 +08:00
Paul Holden f0a2800a3a MDL-66024 tool_uploadcourse: validate shortname/fullname field length. 2019-12-05 23:11:19 +00:00
Kathrin Osswald d294483e9c MDL-60975 behat tests: Added search for admin setting filepickers 2019-12-05 14:59:18 +01:00
Sara Arjona ca89aca702 MDL-65809 environment: mbstring extension required 2019-12-05 14:00:16 +01:00
Sara Arjona 7e561cc4a8 MDL-65809 environment: PHP 7.2 required 2019-12-05 14:00:16 +01:00
Sara Arjona 57d601bc23 MDL-65809 environment: postgres requirement up to 9.5 2019-12-05 14:00:16 +01:00
Sara Arjona 7cdc332930 MDL-65809 environment: mariadb requirement up to 10.2 2019-12-05 14:00:16 +01:00
Sara Arjona 484eab15e3 MDL-65809 environment: 3.5 (LTS) required 2019-12-05 14:00:16 +01:00
Sara Arjona 0a0d55a3e1 MDL-65809 environment: 3.9 base information
This is a direct copy of the 3.8 branch to have changes
under control easier in next commits.
2019-12-05 14:00:16 +01:00
Eloy Lafuente (stronk7) 773b1f738f weekly release 3.8+ 2019-12-05 13:24:15 +01:00
Eloy Lafuente (stronk7) 96475f49de NOBUG: Fixed SVG browser compatibility 2019-12-05 13:24:13 +01:00
Adrian Greeve 9a64cc2b0b Merge branch 'MDL-65620-38' of git://github.com/aanabit/moodle into MOODLE_38_STABLE 2019-12-05 09:26:43 +08:00
Sara Arjona 56c570f68a MDL-67451 badges: use the site OB version as default 2019-12-04 21:27:16 +01:00
Sara Arjona ab2bb07f2e Merge branch 'MDL-67404_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2019-12-04 11:24:56 +01:00
Amaia Anabitarte d0aa6bf098 MDL-65620 core_message: Notification preferences behat tests 2019-12-04 11:03:49 +01:00
Ferran Recio 132e638209 MDL-67154 theme_boost: fixing firefox printing 2019-12-04 10:53:53 +01:00
Amaia Anabitarte 6713912510 MDL-65620 core_message: User preference generator 2019-12-04 10:03:34 +01:00
Amaia Anabitarte 96c48a5058 MDL-65620 core_message: Default notification preferences 2019-12-04 10:03:34 +01:00
Adrian Greeve d3de95f446 Merge branch 'MDL-40360-38' of git://github.com/lucaboesch/moodle into MOODLE_38_STABLE 2019-12-04 11:50:48 +08:00
Andrew Nicols 6d98038c8f Merge branch 'MDL-67359-38' of git://github.com/Chocolate-lightning/moodle_forum-project into MOODLE_38_STABLE 2019-12-04 10:38:12 +08:00
David Mudrák 83e5983a88 MDL-67277 forum: Replace the HTML comments with Mustache comments
It does not seem necessary to have the actual HTML sent to browsers full
of these developer-focused comments.
2019-12-03 20:16:53 +01:00
David Mudrák 0ddd9c54bc MDL-67277 forum: Remove the pinned class from the first cell
There should be no need to have it, and the name is confusing here.
2019-12-03 20:16:53 +01:00
David Mudrák 39bd01c11a MDL-67277 forum: Do not display discussion topics in bold
The topics are now inside a table header cell, which shows them in bold
by default.
2019-12-03 20:15:50 +01:00
David Mudrák 1e58e180d4 MDL-67277 forum: Apply CSS class describing the discussion status
This is to allow the themes to style pinned, favourited, subscribed and
discussions with unread replies.
2019-12-03 20:15:08 +01:00
Shamim Rezaie 163bff4a18 MDL-67151 qtype_calculatedsimple: Support for the scientific format 2019-12-03 16:57:41 +11:00
Shamim Rezaie 910c2ab7b4 MDL-67151 qtype_calculated: Support for the scientific format 2019-12-03 16:57:41 +11:00
Shamim Rezaie fcf199b0ec MDL-67151 qtype_numerical: Support for the scientific format 2019-12-03 16:57:41 +11:00
Shamim Rezaie bb511f30d6 MDL-67151 core_question: Support scientific format at question preview 2019-12-03 16:57:41 +11:00
Shamim Rezaie 481ad40e0e MDL-67151 forms: Support for the scientific format in the float element 2019-12-03 16:57:41 +11:00
Shamim Rezaie 031f3a1d4b MDL-67151 core: format_float can auto detect number of decimal points 2019-12-03 16:57:36 +11:00
Mathew May 5548689ead MDL-67359 mod_forum: Relocate notification templates to reallign it 2019-12-03 12:57:41 +08:00
Sara Arjona f751a8edbe Merge branch 'wip-MDL-67339-38stable' of https://github.com/Beedell/moodle into MOODLE_38_STABLE 2019-12-02 18:06:31 +01:00
John Beedell 0de719024c MDL-67339 behat: Enhance Behat exception message 2019-12-02 09:53:35 +00:00
Shamim Rezaie ac084982cf MDL-67392 mod_forum: Fix unescaped quotes issue in template 2019-12-02 20:50:40 +11:00
Jake Dallimore d3158895a8 Merge branch 'MDL-66581-38' of git://github.com/junpataleta/moodle into MOODLE_38_STABLE 2019-12-02 16:12:47 +08:00
Jun Pataleta 0e58303ea3 MDL-66581 auth: Properly assign the link attribute 2019-12-02 15:30:39 +08:00
Iñigo Zendegi f0d380703a MDL-66581 auth: Do string concatenation for the password change URL
This reverts the change introduced by MDL-59298 where the password
change URL data is being assigned with a moodle_url object instead
of concatenating it.
2019-12-02 15:30:39 +08:00
Jake Dallimore baf264ebc8 Merge branch 'MDL-66877-38' of git://github.com/jleyva/moodle into MOODLE_38_STABLE 2019-12-02 10:02:34 +08:00
Luca Bösch e61f7ba324 MDL-40360 gradingform_rubric: remove unused class 'label' for a label. 2019-11-30 10:28:22 +01:00
Shamim Rezaie afda296526 MDL-65849 mod_forum: Add course param to the author's profile url 2019-11-29 20:58:37 +11:00
Eloy Lafuente (stronk7) 6d6b14e8a4 weekly release 3.8+ 2019-11-29 00:45:52 +01:00
Juan Leyva 27d6bd5de1 MDL-66877 mod: Fix unfiltered activity names in page headings 2019-11-28 17:24:31 +01:00
Juan Leyva 907db7f06b MDL-66877 mod: Fix WebServices returning unfiltered activity names 2019-11-28 17:24:31 +01:00
Eloy Lafuente (stronk7) 33bfd161cd MDL-67404 composer: update to newer versions
(using php71 for this branch)

Without changing any requirement, just an update
to get latest versions onboard, some fixing known
php 7.4 issues.
2019-11-28 13:12:23 +01:00
Andrew Nicols f88b4e9f81 MDL-67348 theme: Return CSS from localcache if available 2019-11-27 10:38:52 +08:00
Eloy Lafuente (stronk7) 114f0b612f Merge branch 'MDL-67300-m38' of https://github.com/sammarshallou/moodle into MOODLE_38_STABLE
(fix trailing whitespace case)
2019-11-26 22:29:37 +01:00
Jun Pataleta a5f1dd6cb1 Merge branch 'MOODLE_38_MDL-56886' of https://github.com/golenkovm/moodle into MOODLE_38_STABLE 2019-11-26 22:32:41 +08:00
Luca Bösch 283cd6db67 MDL-67210 tool_uploadcourse: Allow only 0 and 1 for visible value. 2019-11-26 08:30:34 +01:00
Eloy Lafuente (stronk7) 3eac4851e3 MDL-67307 core: Fix onject creation from empty value cases
The "creating default object from empty value" warning is now consistently
thrown if a falsy value is promoted into an stdClass object. Previously some
cases like `$null->prop[0] = $val` missed this warning.
2019-11-26 14:15:06 +08:00
Sara Arjona 006ec3c96f MDL-67042 customfield: Add behat tests to check hidden fields
Fields with the visibility different to Everyone should
be never displayed in the available filters custom field.
2019-11-26 11:59:41 +08:00
Sara Arjona cabc1dafa9 MDL-67042 customfield: Display only fields visible to everybody
When defining the available filters for the Dashboard, only the
fields visible to everyone should be displayed in the Custom field
filter.
2019-11-26 11:59:36 +08:00
Eloy Lafuente (stronk7) 1b4c878f48 MDL-66966 tcpdf: Update readme to point to manual commits to review
Apart from the main import of the library, there are a couple of
commits (with corresponding PRs upstream) that have been added to
provide php74 compatibility.

This commit addes them to the instructions, to ensure that they
will be reviewed on next import.
2019-11-26 11:43:34 +08:00
Eloy Lafuente (stronk7) 91286bb138 MDL-66966 tcpdf: Silence non-existing K_PATH_CACHE
I was fixing this adding a extra dir_exists() check that
is better than the silence operator but that was that already
there was a PR using @. So went to it.

This is https://git.io/JeKft
2019-11-26 11:43:25 +08:00
Eloy Lafuente (stronk7) 71af7accff MDL-66966 tcpdf: Some more curly braces to fix
This is https://git.io/JeKfT
2019-11-26 11:43:18 +08:00
Eloy Lafuente (stronk7) ce97501b2b MDL-66966 tcpdf: PHP 7.4 - cannot use array offset on integers
This is https://git.io/JeKfU
2019-11-26 11:43:10 +08:00
Eloy Lafuente (stronk7) dadb3cb372 MDL-66966 tcpdf: Bump to tcpdf 6.3.2
Bug fixes and php74 support.
2019-11-26 11:43:00 +08:00
Peter 5cb05d8b77 MDL-67233 mod_timeline: Allow events with only open dates in the future 2019-11-26 11:27:01 +08:00
Bas Brands e29b355121 MDL-67222 tool_lp: update css classes for Bootstrap 4.3 2019-11-26 10:12:46 +08:00
Mikhail Golenkov 95ca6f656e MDL-56886 navigation: Allow local plugins to modify navigation via AJAX. 2019-11-26 13:01:14 +11:00
Claude Vervoort fbd1829594 MDL-66708 lti adv: fix check for key in config 2019-11-25 14:17:08 -05:00
Marina Glancy 0c91305856 MDL-67342 theme_boost: Do not hardcode tooltip container 2019-11-25 15:59:25 +01:00
Sara Arjona c42b488aaf Merge branch 'MDL-66627-38' of git://github.com/mickhawkins/moodle into MOODLE_38_STABLE 2019-11-25 15:42:02 +01:00
David Monllaó 5bde4eb35e MDL-67217 unittest: usleep and windows don't get along well 2019-11-25 16:13:39 +08:00
Andrew Nicols 1943c03bbb MDL-67168 forum: Correct behaviour of viewfullnames 2019-11-25 08:56:37 +01:00
Jun Pataleta 0da427c800 Merge branch 'MDL-65956-38-1' of git://github.com/mihailges/moodle into MOODLE_38_STABLE 2019-11-25 14:23:11 +08:00
Mihail Geshoski 7045a22f3a MDL-65956 mod_assign: Add behat tests 2019-11-25 10:50:22 +08:00
Mihail Geshoski c7f9c7ae0f MDL-65956 mod_assign: Add proper capability checks and error handling 2019-11-25 10:50:22 +08:00
Andrew Nicols 751e4964b1 MDL-67285 core: YUI dialogues must use focuslock
YUI Dialogues were using an older method for locking focus to modals,
but this way conflicts with the way in which we lock focus for AMD
modules.

As a result, when an AMD dialogue launches a YUI dialogue the focus is
not correctly locked and it is not possible to focus on anything in the
YUI dialogue.

This includes a minor changes to the focuslock AMD module to ensure that
it is possible to loop the focus in both directions. Many of our older
YUI dialogues are themselves focusable. As a result we need to include
the lock region in the calculation when calculating the possible
descendants.
If we do not do so then the reverse looping does not work.
2019-11-25 10:35:08 +08:00
Eloy Lafuente (stronk7) 5a108a3064 MDL-67049 grading: options are array, ensure json_decode() knows it
By default json_decode() returns object for associative arrays. That
was not a problem till now becuause array_key_exists() worked with
objects too. But in php74 that emits a warning.

So we need to ensure that the information arriving to it is
an array, allowing everything to continue working ok.
2019-11-25 09:34:22 +08:00
Eloy Lafuente (stronk7) 417ff4f035 weekly release 3.8+ 2019-11-22 00:17:15 +01:00
sam marshall d3a5df14f7 MDL-67300 Calendar: Inconsistent behaviour of managegroupentries
When calling the calendar_get_allowed_event_types function with
no course id, it is supposed to return true if you have the
relevant permissions in any course.

For users who have the managegroupentries permission, this was not
the case - even though it works correctly if you call the function
with a supplied course id.

This change makes behaviour with and without a supplied course id
consistent.
2019-11-21 10:54:08 +00:00
Eloy Lafuente (stronk7) 82853489ca MDL-67035 tags: fix nested ternary operators to be php74 compliant
Nesting ternary operators without explicit parentheses is deprecated:

    // Code like
    $a ? $b : $c ? $d : $e
    // should be replaced by (current interpretation)
    ($a ? $b : $c) ? $d : $e
    // or (likely intended interpretation)
    $a ? $b : ($c ? $d : $e)
2019-11-21 11:55:27 +08:00
Eloy Lafuente (stronk7) 9eaea6a7bf MDL-66964 markdown: add details to readme
The commit to apply, from upstream repo, is:

https://github.com/michelf/php-markdown/commit/a35858f0409e5f01474f5cd562d17289fe8e5435

But it doesn't apply clean to our current 1.8.0 version.

So we have ended a slightly different version in core reproducing the same changes.
2019-11-21 11:37:50 +08:00
Eloy Lafuente (stronk7) f11b82df7c MDL-66964 markdown: php74 fixup for markdown lib 1.8.0
Note this is different from the upstream commit:

https://github.com/michelf/php-markdown/commit/a35858f0409e5f01474f5cd562d17289fe8e5435

because it was conflicting so only the cases corresponding
to our current 1.8.0 version have been modified.

This commit is trivial, just a pure curly to square replacement.
2019-11-21 11:37:50 +08:00
Tim Hunt 5d2f8bd98d MDL-48024 behat: allow plugins to have data generators
This extends the step
Given the following "users" exist:
to also support things like
Given the following "mod_quiz > user overrides" exist:

Instructions are on the behat_data_generators and
behat_generator_base classes.
2019-11-21 09:33:48 +08:00
Eloy Lafuente (stronk7) 023109f1b1 MDL-67030 htmlpurifier: add details to readme 2019-11-21 08:19:17 +08:00
Eloy Lafuente (stronk7) 51bedcee13 MDL-67030 htmlpurifier: php74 fixup for htmlpurifier v4.10.0
This simply applies this pull request:

https://github.com/ezyang/htmlpurifier/pull/224

straight to our library. Once there is some new htmlpurifier
release available (>v4.11.0) we'll be back upstream because
the fix will be included.
2019-11-21 08:19:11 +08:00
Eloy Lafuente (stronk7) 7cec76396f MDL-67031 s3: php74 fixup for class S3 v0.5.1 2019-11-20 16:22:07 +08:00
Eloy Lafuente (stronk7) daed88e656 MDL-67077 h5p: php74 fix (curly braces) for the H5P lib
This has been sent also upstream @ https://github.com/h5p/h5p-php-library/pull/69
2019-11-20 16:11:55 +08:00
Michael Hawkins 212595bbd0 MDL-66627 forumreport_summary: Added content access behat tests 2019-11-20 14:58:22 +08:00
Eloy Lafuente (stronk7) 6cff678c08 MDL-67034 lti_provider: php74 fix (curly braces) for LTI Provider lib 2019-11-20 13:17:09 +08:00
Eloy Lafuente (stronk7) 980193f55b MDL-67034 google: php74 fix (curly braces) for the Google-Client lib 2019-11-20 13:17:02 +08:00
Eloy Lafuente (stronk7) b4f9c2e906 MDL-67034 adodb: php74 fix (curly braces) for the AdoDB lib 2019-11-20 13:16:55 +08:00
Eloy Lafuente (stronk7) 93ed2a597c MDL-67034 horde: php74 fix (curly braces) for the Horde lib 2019-11-20 13:16:49 +08:00
Eloy Lafuente (stronk7) a2c6a69070 MDL-67029 bennu: add details to readme 2019-11-20 11:46:18 +08:00
Eloy Lafuente (stronk7) 7a68a37fda MDL-67029 bennu: php74 fixup for bennu lib 0.1-custom 2019-11-20 11:46:13 +08:00
Eloy Lafuente (stronk7) 3c1b6ed7bd MDL-67017 typo3: add details to readme 2019-11-20 10:01:13 +08:00
Eloy Lafuente (stronk7) 8ff55e3b1b MDL-67017 typo3: php74 fixup for typo3 lib 4.7.19
We are using a really outdated Typo3 library (2014) already patched
for php73 support. Plus, probably, we'll be soon removing it from core.

So we have decided to, instead of upgrade, apply the needed php74 fixes.
2019-11-20 10:01:02 +08:00
sam marshall 7d05f78363 MDL-67274 Tasks: Log display fails with memory errors 2019-11-19 10:51:22 +08:00
Jun Pataleta d0a9211f51 MDL-67148 tool_mobile: Set auth_cas|auth_name config value in unit test
Thanks to Renaat Debleu for the fix suggestion!
2019-11-18 18:50:11 +01:00
Marina Glancy e2a0a42003 MDL-67073 core_course: fix capability context 2019-11-18 16:02:46 +08:00
Jake Dallimore 7e24491f2c Merge branch 'MDL-67284_38' of https://github.com/stronk7/moodle into MOODLE_38_STABLE 2019-11-18 11:29:29 +08:00
Eloy Lafuente (stronk7) 4619c8a7e3 MDL-67284 mod_feedback: Add missing file phpdoc block 2019-11-17 12:47:05 +01:00
Eloy Lafuente (stronk7) 2aff0046c1 MDL-67284 upgrade: add 3.8.0 separation line to all upgrade scripts 2019-11-17 11:43:41 +01:00
6229 changed files with 101473 additions and 296417 deletions
+17 -19
View File
@@ -9,8 +9,6 @@ cache/stores/mongodb/MongoDB/
enrol/lti/ims-blti/
filter/algebra/AlgParser.pm
filter/tex/mimetex.*
h5p/h5plib/v124/joubel/core/
h5p/h5plib/v124/joubel/editor/
lib/editor/atto/plugins/html/yui/src/codemirror/
lib/editor/atto/plugins/html/yui/src/beautify/
lib/editor/atto/yui/src/rangy/js/*.*
@@ -63,9 +61,9 @@ lib/amd/src/popper.js
lib/geopattern-php/
lib/php-jwt/
lib/babel-polyfill/
lib/polyfills/
lib/mdn-polyfills/
lib/emoji-data/
lib/plist/
lib/h5p/
media/player/videojs/amd/src/video-lazy.js
media/player/videojs/amd/src/Youtube-lazy.js
media/player/videojs/videojs/
@@ -74,19 +72,19 @@ media/player/videojs/videojs/video-js.swf
mod/assign/feedback/editpdf/fpdi/
repository/s3/S3.php
theme/boost/scss/bootstrap/
theme/boost/amd/src/bootstrap/alert.js
theme/boost/amd/src/bootstrap/button.js
theme/boost/amd/src/bootstrap/carousel.js
theme/boost/amd/src/bootstrap/collapse.js
theme/boost/amd/src/bootstrap/dropdown.js
theme/boost/amd/src/bootstrap/index.js
theme/boost/amd/src/bootstrap/modal.js
theme/boost/amd/src/bootstrap/popover.js
theme/boost/amd/src/bootstrap/tools/sanitizer.js
theme/boost/amd/src/bootstrap/scrollspy.js
theme/boost/amd/src/bootstrap/tab.js
theme/boost/amd/src/bootstrap/toast.js
theme/boost/amd/src/bootstrap/tooltip.js
theme/boost/amd/src/bootstrap/util.js
theme/boost/amd/src/alert.js
theme/boost/amd/src/button.js
theme/boost/amd/src/carousel.js
theme/boost/amd/src/collapse.js
theme/boost/amd/src/dropdown.js
theme/boost/amd/src/index.js
theme/boost/amd/src/modal.js
theme/boost/amd/src/popover.js
theme/boost/amd/src/sanitizer.js
theme/boost/amd/src/scrollspy.js
theme/boost/amd/src/tab.js
theme/boost/amd/src/toast.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/fontawesome/
theme/boost/scss/fontawesome/
+2 -3
View File
@@ -211,7 +211,7 @@
},
// We're using babel transpiling so use their parser
// for linting.
parser: '@babel/eslint-parser',
parser: 'babel-eslint',
// Check AMD with some slightly stricter rules.
rules: {
'no-unused-vars': 'error',
@@ -242,8 +242,7 @@
},
parserOptions: {
'ecmaVersion': 9,
'sourceType': 'module',
'requireConfigFile': false,
'sourceType': 'module'
}
}
]
+3 -7
View File
@@ -3,8 +3,6 @@
"Feature": 0,
"Background": 2,
"Scenario": 2,
"Examples": 4,
"example": 6,
"Step": 4,
"given": 4,
"and": 4
@@ -16,9 +14,7 @@
"no-multiple-empty-lines": "on",
"no-partially-commented-tag-lines": "on",
"no-trailing-spaces": "on",
"no-unnamed-features": "on",
"no-unnamed-scenarios": "on",
"no-scenario-outlines-without-examples": "on",
"no-examples-in-scenarios": "on",
"new-line-at-eof": ["on", "yes"]
"no-unamed-features": "on",
"no-unamed-scenarios": "on",
"no-scenario-outlines-without-examples": "on"
}
-2
View File
@@ -1,2 +0,0 @@
# Primary donations pages.
custom: ["https://moodle.com/donations/", moodle.org]
-71
View File
@@ -1,71 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Template configuraton file for github actions CI/CD.
*
* @package core
* @copyright 2020 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
// This cannot be used out from a github actions workflow, so just exit.
getenv('GITHUB_WORKFLOW') || die; // phpcs:ignore moodle.Files.MoodleInternal.MoodleInternalGlobalState
unset($CFG);
global $CFG;
$CFG = new stdClass();
$CFG->dbtype = getenv('dbtype');
$CFG->dblibrary = 'native';
$CFG->dbhost = '127.0.0.1';
$CFG->dbname = 'test';
$CFG->dbuser = 'test';
$CFG->dbpass = 'test';
$CFG->prefix = 'm_';
$CFG->dboptions = ['dbcollation' => 'utf8mb4_bin'];
$host = 'localhost';
$CFG->wwwroot = "http://{$host}";
$CFG->dataroot = realpath(dirname(__DIR__)) . '/moodledata';
$CFG->admin = 'admin';
$CFG->directorypermissions = 0777;
// Debug options - possible to be controlled by flag in future.
$CFG->debug = (E_ALL | E_STRICT); // DEBUG_DEVELOPER.
$CFG->debugdisplay = 1;
$CFG->debugstringids = 1; // Add strings=1 to url to get string ids.
$CFG->perfdebug = 15;
$CFG->debugpageinfo = 1;
$CFG->allowthemechangeonurl = 1;
$CFG->passwordpolicy = 0;
$CFG->cronclionly = 0;
$CFG->pathtophp = getenv('pathtophp');
$CFG->phpunit_dataroot = realpath(dirname(__DIR__)) . '/phpunitdata';
$CFG->phpunit_prefix = 't_';
define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://localhost:8080');
define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://localhost:8080');
define('TEST_SESSION_REDIS_HOST', 'localhost');
define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'localhost');
// TODO: add others (solr, mongodb, memcached, ldap...).
// Too much for now: define('PHPUNIT_LONGTEST', true); // Only leaves a few tests out and they are run later by CI.
require_once(__DIR__ . '/lib/setup.php');
-112
View File
@@ -1,112 +0,0 @@
name: Core
on:
push:
branches-ignore:
- master
- MOODLE_[0-9]+_STABLE
tags-ignore:
- v[0-9]+.[0-9]+.[0-9]+*
env:
php: 7.4
jobs:
Grunt:
runs-on: ubuntu-22.04
steps:
- name: Checking out code
uses: actions/checkout@v3
- name: Configuring node & npm
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- name: Installing node stuff
run: npm install
- name: Running grunt
run: npx grunt
- name: Looking for uncommitted changes
# Add all files to the git index and then run diff --cached to see all changes.
# This ensures that we get the status of all files, including new files.
# We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
run: |
git add .
git reset -- npm-shrinkwrap.json
git diff --cached --exit-code
PHPUnit:
runs-on: ${{ matrix.os }}
services:
exttests:
image: moodlehq/moodle-exttests
ports:
- 8080:80
redis:
image: redis
ports:
- 6379:6379
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-22.04
php: 7.2
db: mysqli
- os: ubuntu-22.04
php: 7.4
db: pgsql
steps:
- name: Setting up DB mysql
if: ${{ matrix.db == 'mysqli' }}
uses: moodlehq/mysql-action@v1
with:
collation server: utf8mb4_bin
mysql version: 5.7
mysql database: test
mysql user: test
mysql password: test
use tmpfs: true
tmpfs size: '1024M'
extra conf: --skip-log-bin
- name: Setting up DB pgsql
if: ${{ matrix.db == 'pgsql' }}
uses: m4nu56/postgresql-action@v1
with:
postgresql version: 9.6
postgresql db: test
postgresql user: test
postgresql password: test
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v4
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v3
- name: Setting up PHPUnit
env:
dbtype: ${{ matrix.db }}
run: |
echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
cp .github/workflows/config-template.php config.php
mkdir ../moodledata
sudo locale-gen en_AU.UTF-8
php admin/tool/phpunit/cli/init.php --no-composer-self-update
- name: Running PHPUnit tests
env:
dbtype: ${{ matrix.db }}
run: vendor/bin/phpunit -v
-1
View File
@@ -44,4 +44,3 @@ composer.phar
/lib/yuilib/*/*/*-coverage.js
atlassian-ide-plugin.xml
/node_modules/
moodle-plugin-ci.phar
+1 -1
View File
@@ -1 +1 @@
lts/gallium
v14.0.0
+17 -19
View File
@@ -10,8 +10,6 @@ cache/stores/mongodb/MongoDB/
enrol/lti/ims-blti/
filter/algebra/AlgParser.pm
filter/tex/mimetex.*
h5p/h5plib/v124/joubel/core/
h5p/h5plib/v124/joubel/editor/
lib/editor/atto/plugins/html/yui/src/codemirror/
lib/editor/atto/plugins/html/yui/src/beautify/
lib/editor/atto/yui/src/rangy/js/*.*
@@ -64,9 +62,9 @@ lib/amd/src/popper.js
lib/geopattern-php/
lib/php-jwt/
lib/babel-polyfill/
lib/polyfills/
lib/mdn-polyfills/
lib/emoji-data/
lib/plist/
lib/h5p/
media/player/videojs/amd/src/video-lazy.js
media/player/videojs/amd/src/Youtube-lazy.js
media/player/videojs/videojs/
@@ -75,19 +73,19 @@ media/player/videojs/videojs/video-js.swf
mod/assign/feedback/editpdf/fpdi/
repository/s3/S3.php
theme/boost/scss/bootstrap/
theme/boost/amd/src/bootstrap/alert.js
theme/boost/amd/src/bootstrap/button.js
theme/boost/amd/src/bootstrap/carousel.js
theme/boost/amd/src/bootstrap/collapse.js
theme/boost/amd/src/bootstrap/dropdown.js
theme/boost/amd/src/bootstrap/index.js
theme/boost/amd/src/bootstrap/modal.js
theme/boost/amd/src/bootstrap/popover.js
theme/boost/amd/src/bootstrap/tools/sanitizer.js
theme/boost/amd/src/bootstrap/scrollspy.js
theme/boost/amd/src/bootstrap/tab.js
theme/boost/amd/src/bootstrap/toast.js
theme/boost/amd/src/bootstrap/tooltip.js
theme/boost/amd/src/bootstrap/util.js
theme/boost/amd/src/alert.js
theme/boost/amd/src/button.js
theme/boost/amd/src/carousel.js
theme/boost/amd/src/collapse.js
theme/boost/amd/src/dropdown.js
theme/boost/amd/src/index.js
theme/boost/amd/src/modal.js
theme/boost/amd/src/popover.js
theme/boost/amd/src/sanitizer.js
theme/boost/amd/src/scrollspy.js
theme/boost/amd/src/tab.js
theme/boost/amd/src/toast.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/fontawesome/
theme/boost/scss/fontawesome/
+74 -47
View File
@@ -2,28 +2,45 @@
# process (which uses our internal CI system) this file is here for the benefit
# of community developers git clones - see MDL-51458.
# We currently disable Travis notifications entirely until https://github.com/travis-ci/travis-ci/issues/4976
# is fixed.
notifications:
email:
if: env(MOODLE_EMAIL) != no
email: false
language: php
os: linux
dist: bionic
dist: xenial
services:
- mysql
- docker
php:
# We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
- 7.4
- 7.1.30 # Make this sticky because current default version (7.1.11) has a bug with redis-extension output (MDL-66062)
addons:
postgresql: "9.6"
branches:
except:
- master
- /MOODLE_[0-9]+_STABLE/
- /^v[0-9]+\.[0-9]+\.[0-9]+.*/
env:
# Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
# start first so that the total run time is not too high.
#
# We only run MySQL on PHP 7.2, so run that first.
# CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
# Postgres is significantly is pretty reasonable in its run-time.
# Run CI Tests without running PHPUnit.
- DB=none TASK=CITEST
# Run unit tests on Postgres
- DB=pgsql TASK=PHPUNIT
# Perform an upgrade test too.
- DB=pgsql TASK=UPGRADE
jobs:
# Enable fast finish.
@@ -32,35 +49,12 @@ jobs:
fast_finish: true
include:
# First all the lowest php ones (7.2)
- php: 7.2
env: DB=none TASK=CITEST
- php: 7.2
env: DB=none TASK=GRUNT NVM_VERSION='lts/gallium'
- if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
php: 7.2
env: DB=pgsql TASK=PHPUNIT
- if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
php: 7.2
env: DB=mysqli TASK=PHPUNIT
# Then, conditionally, all the highest php ones (7.4)
- if: env(MOODLE_PHP) = "all"
php: 7.4
env: DB=none TASK=CITEST
- if: env(MOODLE_PHP) = "all"
php: 7.4
env: DB=none TASK=GRUNT NVM_VERSION='lts/gallium'
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
php: 7.4
env: DB=pgsql TASK=PHPUNIT
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
php: 7.4
# Run mysql only on highest - it's just too slow
- php: 7.4
env: DB=mysqli TASK=PHPUNIT
# Run grunt/npm install on highest version too ('node' is an alias for the latest node.js version.)
- php: 7.4
env: DB=none TASK=GRUNT NVM_VERSION='lts/carbon'
cache:
directories:
@@ -81,8 +75,7 @@ install:
sudo service mysql stop
sudo mv /var/lib/mysql /mnt/ramdisk
sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
echo -e "[mysqld]\nskip-log-bin" | sudo tee -a /etc/mysql/my.cnf
sudo service mysql start
sudo service mysql restart
fi
- >
if [ "$DB" = 'pgsql' ];
@@ -93,7 +86,6 @@ install:
sudo mv /var/lib/postgresql /mnt/ramdisk
sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
sudo service postgresql start 9.6
sh -c 'until pg_isready -p 5432; do echo "Waiting for the DB to be up..."; sleep 2; done'
fi
- >
if [ "$TASK" = 'PHPUNIT' ];
@@ -122,7 +114,7 @@ install:
before_script:
- phpenv config-rm xdebug.ini
- >
if [ "$TASK" = 'PHPUNIT' ];
if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ];
then
# Copy generic configuration in place.
cp config-dist.php config.php ;
@@ -182,9 +174,7 @@ before_script:
# Enable test external resources
sed -i \
-e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://127.0.0.1:8080');" \
-e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://127.0.0.1:8080');" \
config.php ;
# Redis cache store tests
sed -i \
-e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
@@ -222,7 +212,7 @@ before_script:
# We need the official upstream for comparison
git remote add upstream https://github.com/moodle/moodle.git;
git fetch upstream MOODLE_39_STABLE;
git fetch upstream MOODLE_38_STABLE;
export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
export GIT_COMMIT="$TRAVIS_COMMIT";
export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
@@ -233,11 +223,39 @@ before_script:
export phpcmd=`which php`;
fi
########################################################################
# Upgrade test
########################################################################
- >
if [ "$TASK" = 'UPGRADE' ];
then
# We need the official upstream.
git remote add upstream https://github.com/moodle/moodle.git;
# Checkout 30 STABLE branch (the first version compatible with PHP 7.x)
git fetch upstream MOODLE_30_STABLE;
git checkout MOODLE_30_STABLE;
# Perform the upgrade
php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade;
# Return to the previous commit
git checkout -;
# Perform the upgrade
php admin/cli/upgrade.php --non-interactive --allow-unstable ;
# The local_ci repository can be used to check upgrade savepoints.
git clone https://github.com/moodlehq/moodle-local_ci.git local/ci ;
fi
script:
- >
if [ "$TASK" = 'PHPUNIT' ];
then
vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
fi
- >
@@ -258,10 +276,19 @@ script:
git diff --cached --exit-code ;
fi
after_script:
########################################################################
# Upgrade test
########################################################################
- >
if [ "$TASK" = 'PHPUNIT' ];
if [ "$TASK" = 'UPGRADE' ];
then
EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
cp local/ci/check_upgrade_savepoints/check_upgrade_savepoints.php ./check_upgrade_savepoints.php
result=`php check_upgrade_savepoints.php`;
# Check if there are problems
count=`echo "$result" | grep -P "ERROR|WARN" | wc -l` ;
if (($count > 0));
then
echo "$result"
exit 1 ;
fi
fi
+170 -445
View File
@@ -20,136 +20,22 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Grunt configuration
*/
/* eslint-env node */
/**
* Calculate the cwd, taking into consideration the `root` option (for Windows).
*
* @param {Object} grunt
* @returns {String} The current directory as best we can determine
*/
const getCwd = grunt => {
const fs = require('fs');
const path = require('path');
let cwd = fs.realpathSync(process.env.PWD || process.cwd());
// Windows users can't run grunt in a subdirectory, so allow them to set
// the root by passing --root=path/to/dir.
if (grunt.option('root')) {
const root = grunt.option('root');
if (grunt.file.exists(__dirname, root)) {
cwd = fs.realpathSync(path.join(__dirname, root));
grunt.log.ok('Setting root to ' + cwd);
} else {
grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
}
}
return cwd;
};
/**
* Register any stylelint tasks.
*
* @param {Object} grunt
* @param {Array} files
* @param {String} fullRunDir
*/
const registerStyleLintTasks = (grunt, files, fullRunDir) => {
const getCssConfigForFiles = files => {
return {
stylelint: {
css: {
// Use a fully-qualified path.
src: files,
options: {
configOverrides: {
rules: {
// These rules have to be disabled in .stylelintrc for scss compat.
"at-rule-no-unknown": true,
}
}
}
},
},
};
};
const getScssConfigForFiles = files => {
return {
stylelint: {
scss: {
options: {syntax: 'scss'},
src: files,
},
},
};
};
let hasCss = true;
let hasScss = true;
if (files) {
// Specific files were passed. Just set them up.
grunt.config.merge(getCssConfigForFiles(files));
grunt.config.merge(getScssConfigForFiles(files));
} else {
// The stylelint system does not handle the case where there was no file to lint.
// Check whether there are any files to lint in the current directory.
const glob = require('glob');
const scssSrc = [];
glob.sync(`${fullRunDir}/**/*.scss`).forEach(path => scssSrc.push(path));
if (scssSrc.length) {
grunt.config.merge(getScssConfigForFiles(scssSrc));
} else {
hasScss = false;
}
const cssSrc = [];
glob.sync(`${fullRunDir}/**/*.css`).forEach(path => cssSrc.push(path));
if (cssSrc.length) {
grunt.config.merge(getCssConfigForFiles(cssSrc));
} else {
hasCss = false;
}
}
const scssTasks = ['sass'];
if (hasScss) {
scssTasks.unshift('stylelint:scss');
}
grunt.registerTask('scss', scssTasks);
const cssTasks = [];
if (hasCss) {
cssTasks.push('stylelint:css');
}
grunt.registerTask('rawcss', cssTasks);
grunt.registerTask('css', ['scss', 'rawcss']);
};
/**
* Grunt configuration.
*
* @param {Object} grunt
*/
module.exports = function(grunt) {
const path = require('path');
const tasks = {};
const async = require('async');
const DOMParser = require('@xmldom/xmldom').DOMParser;
const xpath = require('xpath');
const semver = require('semver');
const watchman = require('fb-watchman');
const watchmanClient = new watchman.Client();
const fs = require('fs');
const ComponentList = require(path.resolve('GruntfileComponents.js'));
const sass = require('node-sass');
var path = require('path'),
tasks = {},
cwd = process.env.PWD || process.cwd(),
async = require('async'),
DOMParser = require('xmldom').DOMParser,
xpath = require('xpath'),
semver = require('semver'),
watchman = require('fb-watchman'),
watchmanClient = new watchman.Client(),
gruntFilePath = process.cwd();
// Verify the node version is new enough.
var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
@@ -158,64 +44,34 @@ module.exports = function(grunt) {
grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
}
// Detect directories:
// * gruntFilePath The real path on disk to this Gruntfile.js
// * cwd The current working directory, which can be overridden by the `root` option
// * relativeCwd The cwd, relative to the Gruntfile.js
// * componentDirectory The root directory of the component if the cwd is in a valid component
// * inComponent Whether the cwd is in a valid component
// * runDir The componentDirectory or cwd if not in a component, relative to Gruntfile.js
// * fullRunDir The full path to the runDir
const gruntFilePath = fs.realpathSync(process.cwd());
const cwd = getCwd(grunt);
const relativeCwd = path.relative(gruntFilePath, cwd);
const componentDirectory = ComponentList.getOwningComponentDirectory(relativeCwd);
const inComponent = !!componentDirectory;
const runDir = inComponent ? componentDirectory : relativeCwd;
const fullRunDir = fs.realpathSync(gruntFilePath + path.sep + runDir);
grunt.log.debug('============================================================================');
grunt.log.debug(`= Node version: ${process.versions.node}`);
grunt.log.debug(`= grunt version: ${grunt.package.version}`);
grunt.log.debug(`= process.cwd: '` + process.cwd() + `'`);
grunt.log.debug(`= process.env.PWD: '${process.env.PWD}'`);
grunt.log.debug(`= path.sep '${path.sep}'`);
grunt.log.debug('============================================================================');
grunt.log.debug(`= gruntFilePath: '${gruntFilePath}'`);
grunt.log.debug(`= relativeCwd: '${relativeCwd}'`);
grunt.log.debug(`= componentDirectory: '${componentDirectory}'`);
grunt.log.debug(`= inComponent: '${inComponent}'`);
grunt.log.debug(`= runDir: '${runDir}'`);
grunt.log.debug(`= fullRunDir: '${fullRunDir}'`);
grunt.log.debug('============================================================================');
if (inComponent) {
grunt.log.ok(`Running tasks for component directory ${componentDirectory}`);
// Windows users can't run grunt in a subdirectory, so allow them to set
// the root by passing --root=path/to/dir.
if (grunt.option('root')) {
var root = grunt.option('root');
if (grunt.file.exists(__dirname, root)) {
cwd = path.join(__dirname, root);
grunt.log.ok('Setting root to ' + cwd);
} else {
grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
}
}
let files = null;
var files = null;
if (grunt.option('files')) {
// Accept a comma separated list of files to process.
files = grunt.option('files').split(',');
}
// If the cwd is the amd directory in the current component then it will be empty.
// If the cwd is a child of the component's AMD directory, the relative directory will not start with ..
const inAMD = !path.relative(`${componentDirectory}/amd`, cwd).startsWith('..');
var inAMD = path.basename(cwd) == 'amd';
// Globbing pattern for matching all AMD JS source files.
let amdSrc = [];
if (inComponent) {
amdSrc.push(componentDirectory + "/amd/src/*.js");
amdSrc.push(componentDirectory + "/amd/src/**/*.js");
var amdSrc = [];
if (inAMD) {
amdSrc.push(cwd + "/src/*.js");
amdSrc.push(cwd + "/src/**/*.js");
} else {
amdSrc = ComponentList.getAmdSrcGlobList();
}
let yuiSrc = [];
if (inComponent) {
yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
} else {
yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
amdSrc.push("**/amd/src/*.js");
amdSrc.push("**/amd/src/**/*.js");
}
/**
@@ -229,8 +85,8 @@ module.exports = function(grunt) {
* @return {String} The rewritten destination path.
*/
var babelRename = function(destPath, srcPath) {
destPath = srcPath.replace(`amd/src`, `amd/build`);
destPath = destPath.replace(/\.js$/, '.min.js');
destPath = srcPath.replace('src', 'build');
destPath = destPath.replace('.js', '.min.js');
return destPath;
};
@@ -241,115 +97,31 @@ module.exports = function(grunt) {
* @return {array} The list of thirdparty paths.
*/
var getThirdPartyPathsFromXML = function() {
const thirdpartyfiles = ComponentList.getThirdPartyLibsList(gruntFilePath + '/');
const libs = ['node_modules/', 'vendor/'];
var thirdpartyfiles = grunt.file.expand('*/**/thirdpartylibs.xml');
var libs = ['node_modules/', 'vendor/'];
thirdpartyfiles.forEach(function(file) {
const dirname = path.dirname(file);
var dirname = path.dirname(file);
const doc = new DOMParser().parseFromString(grunt.file.read(file));
const nodes = xpath.select("/libraries/library/location/text()", doc);
var doc = new DOMParser().parseFromString(grunt.file.read(file));
var nodes = xpath.select("/libraries/library/location/text()", doc);
nodes.forEach(function(node) {
let lib = path.posix.join(dirname, node.toString());
if (grunt.file.isDir(lib)) {
// Ensure trailing slash on dirs.
lib = lib.replace(/\/?$/, '/');
}
nodes.forEach(function(node) {
var lib = path.join(dirname, node.toString());
if (grunt.file.isDir(lib)) {
// Ensure trailing slash on dirs.
lib = lib.replace(/\/?$/, '/');
}
// Look for duplicate paths before adding to array.
if (libs.indexOf(lib) === -1) {
libs.push(lib);
}
});
// Look for duplicate paths before adding to array.
if (libs.indexOf(lib) === -1) {
libs.push(lib);
}
});
});
return libs;
};
/**
* Get the list of feature files to pass to the gherkin linter.
*
* @returns {Array}
*/
const getGherkinLintTargets = () => {
if (files) {
// Specific files were requested. Only check these.
return files;
}
if (inComponent) {
return [`${runDir}/tests/behat/*.feature`];
}
return ['**/tests/behat/*.feature'];
};
const babelTransform = require('@babel/core').transform;
const babel = (options = {}) => {
return {
name: 'babel',
transform: (code, id) => {
grunt.log.debug(`Transforming ${id}`);
options.filename = id;
const transformed = babelTransform(code, options);
return {
code: transformed.code,
map: transformed.map
};
}
};
};
// Note: We have to use a rate limit plugin here because rollup runs all tasks asynchronously and in parallel.
// When we kick off a full run, if we kick off a rollup of every file this will fork-bomb the machine.
// To work around this we use a concurrent Promise queue based on the number of available processors.
const rateLimit = () => {
const queue = [];
let queueRunner;
const startQueue = () => {
if (queueRunner) {
return;
}
queueRunner = setTimeout(() => {
const limit = Math.max(1, require('os').cpus().length / 2);
grunt.log.debug(`Starting rollup with queue size of ${limit}`);
runQueue(limit);
}, 100);
};
// The queue runner will run the next `size` items in the queue.
const runQueue = (size = 1) => {
queue.splice(0, size).forEach(resolve => {
resolve();
});
};
return {
name: 'ratelimit',
// The options hook is run in parallel.
// We can return an unresolved Promise which is queued for later resolution.
options: async() => {
return new Promise(resolve => {
queue.push(resolve);
startQueue();
});
},
// When an item in the queue completes, start the next item in the queue.
buildEnd: () => {
runQueue();
},
};
};
const terser = require('rollup-plugin-terser').terser;
// Project configuration.
grunt.initConfig({
eslint: {
@@ -364,68 +136,57 @@ module.exports = function(grunt) {
},
amd: {src: files ? files : amdSrc},
// Check YUI module source files.
yui: {src: files ? files : yuiSrc},
yui: {src: files ? files : ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
},
rollup: {
dist: {
options: {
format: 'esm',
dir: 'output',
sourcemap: true,
treeshake: false,
context: 'window',
plugins: [
rateLimit({initialDelay: 0}),
babel({
sourceMaps: true,
comments: false,
compact: false,
plugins: [
'transform-es2015-modules-amd-lazy',
'system-import-transformer',
// This plugin modifies the Babel transpiling for "export default"
// so that if it's used then only the exported value is returned
// by the generated AMD module.
//
// It also adds the Moodle plugin name to the AMD module definition
// so that it can be imported as expected in other modules.
path.resolve('babel-plugin-add-module-to-define.js'),
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
['@babel/plugin-proposal-class-properties', {'loose': false}],
'@babel/plugin-proposal-json-strings'
],
presets: [
['@babel/preset-env', {
targets: {
browsers: [
">0.25%",
"last 2 versions",
"not ie <= 10",
"not op_mini all",
"not Opera > 0",
"not dead"
]
},
modules: false,
useBuiltIns: false
}]
babel: {
options: {
sourceMaps: true,
comments: false,
plugins: [
'transform-es2015-modules-amd-lazy',
'system-import-transformer',
// This plugin modifies the Babel transpiling for "export default"
// so that if it's used then only the exported value is returned
// by the generated AMD module.
//
// It also adds the Moodle plugin name to the AMD module definition
// so that it can be imported as expected in other modules.
path.resolve('babel-plugin-add-module-to-define.js'),
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
['@babel/plugin-proposal-class-properties', {'loose': false}],
'@babel/plugin-proposal-json-strings'
],
presets: [
['minify', {
// This minification plugin needs to be disabled because it breaks the
// source map generation and causes invalid source maps to be output.
simplify: false,
builtIns: false
}],
['@babel/preset-env', {
targets: {
browsers: [
">0.25%",
"last 2 versions",
"not ie <= 10",
"not op_mini all",
"not Opera > 0",
"not dead"
]
}),
terser({
// Do not mangle variables.
// Makes debugging easier.
mangle: false,
}),
],
},
},
modules: false,
useBuiltIns: false
}]
]
},
dist: {
files: [{
expand: true,
src: files ? files : amdSrc,
rename: babelRename
}],
},
}]
}
},
sass: {
dist: {
@@ -435,7 +196,6 @@ module.exports = function(grunt) {
}
},
options: {
implementation: sass,
includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
}
},
@@ -444,72 +204,73 @@ module.exports = function(grunt) {
nospawn: true // We need not to spawn so config can be changed dynamically.
},
amd: {
files: inComponent
? ['amd/src/*.js', 'amd/src/**/*.js']
: ['**/amd/src/**/*.js'],
files: ['**/amd/src/**/*.js'],
tasks: ['amd']
},
boost: {
files: [inComponent ? 'scss/**/*.scss' : 'theme/boost/scss/**/*.scss'],
files: ['**/theme/boost/scss/**/*.scss'],
tasks: ['scss']
},
rawcss: {
files: [
'**/*.css',
],
excludes: [
'**/moodle.css',
'**/editor.css',
],
files: ['**/*.css', '**/theme/**/!(moodle.css|editor.css)'],
tasks: ['rawcss']
},
yui: {
files: inComponent
? ['yui/src/*.json', 'yui/src/**/*.js']
: ['**/yui/src/**/*.js'],
files: ['**/yui/src/**/*.js'],
tasks: ['yui']
},
gherkinlint: {
files: [inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
files: ['**/tests/behat/*.feature'],
tasks: ['gherkinlint']
}
},
shifter: {
options: {
recursive: true,
// Shifter takes a relative path.
paths: files ? files : [runDir]
paths: files ? files : [cwd]
}
},
gherkinlint: {
options: {
files: getGherkinLintTargets(),
files: files ? files : ['**/tests/behat/*.feature'],
}
},
stylelint: {
scss: {
options: {syntax: 'scss'},
src: files ? files : ['*/**/*.scss']
},
css: {
src: files ? files : ['*/**/*.css'],
options: {
configOverrides: {
rules: {
// These rules have to be disabled in .stylelintrc for scss compat.
"at-rule-no-unknown": true,
}
}
}
}
}
});
/**
* Generate ignore files (utilising thirdpartylibs.xml data)
*/
tasks.ignorefiles = function() {
// An array of paths to third party directories.
const thirdPartyPaths = getThirdPartyPathsFromXML();
// Generate .eslintignore.
const eslintIgnores = [
'# Generated by "grunt ignorefiles"',
'*/**/yui/src/*/meta/',
'*/**/build/',
].concat(thirdPartyPaths);
grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
// Generate .stylelintignore.
const stylelintIgnores = [
'# Generated by "grunt ignorefiles"',
'**/yui/build/*',
'theme/boost/style/moodle.css',
'theme/classic/style/moodle.css',
].concat(thirdPartyPaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
// An array of paths to third party directories.
var thirdPartyPaths = getThirdPartyPathsFromXML();
// Generate .eslintignore.
var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
// Generate .stylelintignore.
var stylelintIgnores = [
'# Generated by "grunt ignorefiles"',
'**/yui/build/*',
'theme/boost/style/moodle.css',
'theme/classic/style/moodle.css',
].concat(thirdPartyPaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
};
/**
@@ -605,28 +366,23 @@ module.exports = function(grunt) {
const options = grunt.config('gherkinlint.options');
// Grab the gherkin-lint linter and required scaffolding.
const linter = require('gherkin-lint/dist/linter.js');
const featureFinder = require('gherkin-lint/dist/feature-finder.js');
const configParser = require('gherkin-lint/dist/config-parser.js');
const formatter = require('gherkin-lint/dist/formatters/stylish.js');
const linter = require('gherkin-lint/src/linter.js');
const featureFinder = require('gherkin-lint/src/feature-finder.js');
const configParser = require('gherkin-lint/src/config-parser.js');
const formatter = require('gherkin-lint/src/formatters/stylish.js');
// Run the linter.
return linter.lint(
const results = linter.lint(
featureFinder.getFeatureFiles(grunt.file.expand(options.files)),
configParser.getConfiguration(configParser.defaultConfigFileName)
)
.then(results => {
// Print the results out uncondtionally.
formatter.printResults(results);
);
return results;
})
.then(results => {
// Report on the results.
// The done function takes a bool whereby a falsey statement causes the task to fail.
return results.every(result => result.errors.length === 0);
})
.then(done); // eslint-disable-line promise/no-callback-in-promise
// Print the results out uncondtionally.
formatter.printResults(results);
// Report on the results.
// The done function takes a bool whereby a falsey statement causes the task to fail.
done(results.every(result => result.errors.length === 0));
};
tasks.startup = function() {
@@ -686,7 +442,7 @@ module.exports = function(grunt) {
grunt: true,
// Run from current working dir and inherit stdio from process.
opts: {
cwd: fullRunDir,
cwd: cwd,
stdio: 'inherit'
},
args: [task, filesOption]
@@ -712,26 +468,18 @@ module.exports = function(grunt) {
);
};
const originalWatchConfig = grunt.config.get(['watch']);
const watchConfig = Object.keys(originalWatchConfig).reduce(function(carry, key) {
var watchConfig = grunt.config.get(['watch']);
watchConfig = Object.keys(watchConfig).reduce(function(carry, key) {
if (key == 'options') {
return carry;
}
const value = originalWatchConfig[key];
const taskNames = value.tasks;
const files = value.files;
let excludes = [];
if (value.excludes) {
excludes = value.excludes;
}
var value = watchConfig[key];
var fileGlobs = value.files;
var taskNames = value.tasks;
taskNames.forEach(function(taskName) {
carry[taskName] = {
files,
excludes,
};
carry[taskName] = fileGlobs;
});
return carry;
@@ -765,14 +513,12 @@ module.exports = function(grunt) {
resp.files.forEach(function(file) {
grunt.log.ok('File changed: ' + file.name);
var fullPath = fullRunDir + '/' + file.name;
var fullPath = cwd + '/' + file.name;
Object.keys(watchConfig).forEach(function(task) {
const fileGlobs = watchConfig[task].files;
var match = fileGlobs.some(function(fileGlob) {
return grunt.file.isMatch(`**/${fileGlob}`, fullPath);
var fileGlobs = watchConfig[task];
var match = fileGlobs.every(function(fileGlob) {
return grunt.file.isMatch(fileGlob, fullPath);
});
if (match) {
// If we are watching a subdirectory then the file.name will be relative
// to that directory. However the grunt tasks expect the file paths to be
@@ -804,7 +550,7 @@ module.exports = function(grunt) {
});
// Initiate the watch on the current directory.
watchmanClient.command(['watch-project', fullRunDir], function(watchError, watchResponse) {
watchmanClient.command(['watch-project', cwd], function(watchError, watchResponse) {
if (watchError) {
grunt.log.error('Error initiating watch:', watchError);
watchTaskDone(1);
@@ -826,40 +572,18 @@ module.exports = function(grunt) {
return;
}
// Generate the expression query used by watchman.
// Documentation is limited, but see https://facebook.github.io/watchman/docs/expr/allof.html for examples.
// We generate an expression to match any value in the files list of all of our tasks, but excluding
// all value in the excludes list of that task.
//
// [anyof, [
// [allof, [
// [anyof, [
// ['match', validPath, 'wholename'],
// ['match', validPath, 'wholename'],
// ],
// [not,
// [anyof, [
// ['match', invalidPath, 'wholename'],
// ['match', invalidPath, 'wholename'],
// ],
// ],
// ],
var matchWholeName = fileGlob => ['match', fileGlob, 'wholename'];
// Use the matching patterns specified in the watch config.
var matches = Object.keys(watchConfig).map(function(task) {
const matchAll = [];
matchAll.push(['anyof'].concat(watchConfig[task].files.map(matchWholeName)));
var fileGlobs = watchConfig[task];
var fileGlobMatches = fileGlobs.map(function(fileGlob) {
return ['match', fileGlob, 'wholename'];
});
if (watchConfig[task].excludes.length) {
matchAll.push(['not', ['anyof'].concat(watchConfig[task].excludes.map(matchWholeName))]);
}
return ['allof'].concat(matchAll);
return ['allof'].concat(fileGlobMatches);
});
matches = ['anyof'].concat(matches);
var sub = {
expression: matches,
expression: ["anyof"].concat(matches),
// Which fields we're interested in.
fields: ["name", "size", "type"],
// Add our time constraint.
@@ -879,7 +603,7 @@ module.exports = function(grunt) {
return;
}
grunt.log.ok('Listening for changes to files in ' + fullRunDir);
grunt.log.ok('Listening for changes to files in ' + cwd);
});
});
});
@@ -910,8 +634,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-stylelint');
grunt.loadNpmTasks('grunt-rollup');
grunt.loadNpmTasks('grunt-babel');
// Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
grunt.renameTask('watch', 'watch-grunt');
@@ -922,11 +645,13 @@ module.exports = function(grunt) {
grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
grunt.registerTask('watch', 'Run tasks on file changes', tasks.watch);
grunt.registerTask('yui', ['eslint:yui', 'shifter']);
grunt.registerTask('amd', ['eslint:amd', 'rollup']);
grunt.registerTask('amd', ['eslint:amd', 'babel']);
grunt.registerTask('js', ['amd', 'yui']);
// Register CSS tasks.
registerStyleLintTasks(grunt, files, fullRunDir);
// Register CSS taks.
grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:css']);
grunt.registerTask('scss', ['stylelint:scss', 'sass']);
grunt.registerTask('rawcss', ['stylelint:css']);
// Register the startup task.
grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);
-188
View File
@@ -1,188 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Helper functions for working with Moodle component names, directories, and sources.
*
* @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
"use strict";
/* eslint-env node */
/** @var {Object} A list of subsystems in Moodle */
const componentData = {};
/**
* Load details of all moodle modules.
*
* @returns {object}
*/
const fetchComponentData = () => {
const fs = require('fs');
const path = require('path');
const glob = require('glob');
const gruntFilePath = process.cwd();
if (!Object.entries(componentData).length) {
componentData.subsystems = {};
componentData.pathList = [];
// Fetch the component definiitions from the distributed JSON file.
const components = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/components.json`));
// Build the list of moodle subsystems.
componentData.subsystems.lib = 'core';
componentData.pathList.push(process.cwd() + path.sep + 'lib');
for (const [component, thisPath] of Object.entries(components.subsystems)) {
if (thisPath) {
// Prefix "core_" to the front of the subsystems.
componentData.subsystems[thisPath] = `core_${component}`;
componentData.pathList.push(process.cwd() + path.sep + thisPath);
}
}
// The list of components incldues the list of subsystems.
componentData.components = componentData.subsystems;
// Go through each of the plugintypes.
Object.entries(components.plugintypes).forEach(([pluginType, pluginTypePath]) => {
// We don't allow any code in this place..?
glob.sync(`${pluginTypePath}/*/version.php`).forEach(versionPath => {
const componentPath = fs.realpathSync(path.dirname(versionPath));
const componentName = path.basename(componentPath);
const frankenstyleName = `${pluginType}_${componentName}`;
componentData.components[`${pluginTypePath}/${componentName}`] = frankenstyleName;
componentData.pathList.push(componentPath);
// Look for any subplugins.
const subPluginConfigurationFile = `${componentPath}/db/subplugins.json`;
if (fs.existsSync(subPluginConfigurationFile)) {
const subpluginList = JSON.parse(fs.readFileSync(fs.realpathSync(subPluginConfigurationFile)));
Object.entries(subpluginList.plugintypes).forEach(([subpluginType, subpluginTypePath]) => {
glob.sync(`${subpluginTypePath}/*/version.php`).forEach(versionPath => {
const componentPath = fs.realpathSync(path.dirname(versionPath));
const componentName = path.basename(componentPath);
const frankenstyleName = `${subpluginType}_${componentName}`;
componentData.components[`${subpluginTypePath}/${componentName}`] = frankenstyleName;
componentData.pathList.push(componentPath);
});
});
}
});
});
}
return componentData;
};
/**
* Get the list of paths to build AMD sources.
*
* @returns {Array}
*/
const getAmdSrcGlobList = () => {
const globList = [];
fetchComponentData().pathList.forEach(componentPath => {
globList.push(`${componentPath}/amd/src/*.js`);
globList.push(`${componentPath}/amd/src/**/*.js`);
});
return globList;
};
/**
* Get the list of paths to build YUI sources.
*
* @param {String} relativeTo
* @returns {Array}
*/
const getYuiSrcGlobList = relativeTo => {
const globList = [];
fetchComponentData().pathList.forEach(componentPath => {
const relativeComponentPath = componentPath.replace(relativeTo, '');
globList.push(`${relativeComponentPath}/yui/src/**/*.js`);
});
return globList;
};
/**
* Get the list of paths to thirdpartylibs.xml.
*
* @param {String} relativeTo
* @returns {Array}
*/
const getThirdPartyLibsList = relativeTo => {
const fs = require('fs');
const path = require('path');
return fetchComponentData().pathList
.map(componentPath => path.relative(relativeTo, componentPath) + '/thirdpartylibs.xml')
.map(componentPath => componentPath.replace(/\\/g, '/'))
.filter(path => fs.existsSync(path))
.sort();
};
/**
* Find the name of the component matching the specified path.
*
* @param {String} path
* @returns {String|null} Name of matching component.
*/
const getComponentFromPath = path => {
const componentList = fetchComponentData().components;
if (componentList.hasOwnProperty(path)) {
return componentList[path];
}
return null;
};
/**
* Check whether the supplied path, relative to the Gruntfile.js, is in a known component.
*
* @param {String} checkPath The path to check. This can be with either Windows, or Linux directory separators.
* @returns {String|null}
*/
const getOwningComponentDirectory = checkPath => {
const path = require('path');
// Fetch all components into a reverse sorted array.
// This ensures that components which are within the directory of another component match first.
const pathList = Object.keys(fetchComponentData().components).sort().reverse();
for (const componentPath of pathList) {
// If the componentPath is the directory being checked, it will be empty.
// If the componentPath is a parent of the directory being checked, the relative directory will not start with ..
if (!path.relative(componentPath, checkPath).startsWith('..')) {
return componentPath;
}
}
return null;
};
module.exports = {
getAmdSrcGlobList,
getComponentFromPath,
getOwningComponentDirectory,
getYuiSrcGlobList,
getThirdPartyLibsList,
};
-1
View File
@@ -1 +0,0 @@
mod/forum/tests/behat/forum_subscriptions_default.feature
+35 -53
View File
@@ -1,66 +1,48 @@
MOODLE TRADEMARKS POLICY
========================
The Moodle Trademark
--------------------
The word "Moodle" is trademarked in many countries around the world. The word
was originally an acronym: Modular Object-Oriented Dynamic Learning
Environment. The trademark is owned by Martin Dougiamas, Founder and Director
of Moodle.
The brand and word "Moodle" has trade mark protection in many countries around
the world. Various Moodle™ trade marks are owned by either Moodle Pty Ltd or
one of its associated entities. The law obligates trade mark owners to police
their trade marks and prevent the use of confusingly similar names by
third parties.
The law obligates trademark owners to police their marks and prevent the use of
confusingly similar names by third parties. Through this policy wed like to
make it clear how Moodle-related projects, organisations, and people can use
the Moodle trademark. Wed also like to be clear about how use of the word is
restricted when used to promote commercial Moodle services. We do this to
protect the very business model that allows us to continue developing Moodle
for you.
We have created a more concise and thorough set of Trademark Guidelines
(https://moodle.com/wp-content/uploads/2023/02/Moodle-Trademark-Guidelines-2023-4.pdf)
to help you understand how to comply with Moodle's trade mark requirements.
The Trademark Guidelines will also assist our Moodle Certified Partners and the
community to understand some of the principles that inform Moodle's stance
whenever potential infringement has been detected by us or our community.
Allowed uses
------------
We need to be clear about use of the word "Moodle" and how we restrict its use
when promoting commercial Moodle™ branded services. The proper use of
trade marks reliably assures consumers about the quality of the associated
products or services and where they have been derived from. Because the
Moodle LMS is made available under the open source GNU General Public License'
that permits you to modify the copyrighted software, the distribution of such
modified software in combination with Moodle trade marks can potentially
mislead others in the community. To be clear, the GNU GPL does not include an
implied right or licence to use Moodle's trade marks.
The following uses dont require any permission at all:
We do all this to protect the very business model that allows us to continue
developing various Moodle software solutions for you.
Allowed uses of "Moodle"
------------------------
The following uses don't require any permission at all:
* Referring to the software or the Moodle project as the "Moodle™ software"
or the "Moodle™ project"
* Describing your own implementation of the Moodle™ software platform
(including within corporate settings).
* Referring to the software or the Moodle project.
* Describing your own Moodle implementation (including within corporate
settings).
* Describing a Moodle-based community hub.
* Describing certain software you've made that integrates with Moodle
branded software (e.g. a Moodle integration feature on another system).
* Describing some software youve made that integrates with Moodle
(eg a Moodle integration feature on another system).
Restricted uses of "Moodle"
---------------------------
Restricted uses
---------------
The following uses are generally prohibited without explicit and direct
permission being granted to you by Moodle Pty Ltd. We do this to protect the
Moodle project from software and sites which could confuse people. If in
doubt, reach out for clarification at <trademarks@moodle.com>
Moodle project from software and sites which could confuse people. Please
contact us to ask for permission in writing.
* You can't use the word "Moodle" or any Moodle logos for commercial purposes
without prior written permission from Moodle HQ.
* You can't use "Moodle" in the name of your software (including Mobile apps).
* You can't use "Moodle" in your company name.
* You can't use "Moodle" in your domain name.
* You can't use "Moodle" in advertising-related keywords (such as Adsense).
* You can't use "Moodle" to describe services around Moodle
(such as hosting, training, support, consulting, course creation services,
theme development, customisation, installation, integration, analytics
and certification) that cause consumers to be confused that you are
associated with Moodle HQ if you are not.
This applies even if you do not charge for the services.
Note that usually only Moodle Partners have this permission.
* You cant use "Moodle" in the name of your software (including Mobile apps)
* You cant use "Moodle" in your company name
* You cant use "Moodle" in your domain name
* You cant use "Moodle" in advertising-related keywords (such as Adsense)
* You cant use "Moodle" to describe services around Moodle (such as hosting,
training, support, consulting, course creation services, theme development,
customisation, installation, integration and certification). This applies
even if you do not charge for the services. Note that usually only Moodle
Partners have this permission.
For information about the Moodle Partner Certification Mark as well as for how
to contact us, please see <https://moodle.com/trademarks/>.
+2 -4
View File
@@ -98,10 +98,8 @@ switch ($action) {
default:
break;
}
$new = implode(',', $activeantiviruses);
add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
set_config('antiviruses', $new);
set_config('antiviruses', implode(',', $activeantiviruses));
core_plugin_manager::reset_caches();
redirect ($returnurl);
redirect ($returnurl);
@@ -178,7 +178,6 @@ class filesize extends \admin_setting {
'id' => $this->get_id(),
'name' => $this->get_full_name(),
'value' => $data['v'],
'readonly' => $this->is_readonly(),
'options' => array_map(function($unit, $title) use ($data, $defaultunit) {
return [
'value' => $unit,
-122
View File
@@ -1,122 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Task executor for adhoc tasks.
*
* @package core
* @subpackage cli
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once("{$CFG->libdir}/clilib.php");
require_once("{$CFG->libdir}/cronlib.php");
list($options, $unrecognized) = cli_get_params(
[
'execute' => false,
'help' => false,
'keep-alive' => 0,
'showsql' => false,
'showdebugging' => false,
'ignorelimits' => false,
], [
'h' => 'help',
'e' => 'execute',
'k' => 'keep-alive',
'i' => 'ignorelimits',
]
);
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
}
if ($options['help'] or empty($options['execute'])) {
$help = <<<EOT
Ad hoc cron tasks.
Options:
-h, --help Print out this help
--showsql Show sql queries before they are executed
--showdebugging Show developer level debugging information
-e, --execute Run all queued adhoc tasks
-k, --keep-alive=N Keep this script alive for N seconds and poll for new adhoc tasks
-i --ignorelimits Ignore task_adhoc_concurrency_limit and task_adhoc_max_runtime limits
Example:
\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --execute
EOT;
echo $help;
die;
}
if ($options['showdebugging']) {
set_debugging(DEBUG_DEVELOPER, true);
}
if ($options['showsql']) {
$DB->set_debug(true);
}
if (CLI_MAINTENANCE) {
echo "CLI maintenance mode active, cron execution suspended.\n";
exit(1);
}
if (moodle_needs_upgrading()) {
echo "Moodle upgrade pending, cron execution suspended.\n";
exit(1);
}
if (empty($options['execute'])) {
exit(0);
}
if (empty($options['keep-alive'])) {
$options['keep-alive'] = 0;
}
if (!empty($CFG->showcronsql)) {
$DB->set_debug(true);
}
if (!empty($CFG->showcrondebugging)) {
set_debugging(DEBUG_DEVELOPER, true);
}
$checklimits = empty($options['ignorelimits']);
core_php_time_limit::raise();
// Increase memory limit.
raise_memory_limit(MEMORY_EXTRA);
// Emulate normal session - we use admin account by default.
cron_setup_user();
$humantimenow = date('r', time());
$keepalive = (int)$options['keep-alive'];
\core\local\cli\shutdown::script_supports_graceful_exit();
mtrace("Server Time: {$humantimenow}\n");
cron_run_adhoc_tasks(time(), $keepalive, $checklimits);
+1 -6
View File
@@ -124,12 +124,7 @@ if ($options['unset'] || $options['set'] !== null) {
cli_error('The configuration variable is hard-set in the config.php, unable to change.', 4);
}
$new = $options['set'];
$old = get_config($options['component'], $options['name']);
if ($new !== $old) {
set_config($options['name'], $options['set'], $options['component']);
add_to_config_log($options['name'], $old, $new, $options['component']);
}
set_config($options['name'], $options['set'], $options['component']);
exit(0);
}
-171
View File
@@ -1,171 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* CLI tool for system checks
*
* @package core
* @category check
* @copyright 2020 Brendan Heywood (brendan@catalyst-au.net)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once($CFG->libdir.'/clilib.php');
use core\check\result;
list($options, $unrecognized) = cli_get_params([
'help' => false,
'filter' => '',
'type' => 'status',
'verbose' => false,
], [
'h' => 'help',
'f' => 'filter',
'v' => 'verbose',
't' => 'type',
]);
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
}
$checks = \core\check\manager::get_checks($options['type']);
$types = join(', ', \core\check\manager::TYPES);
$help = "Run Moodle system checks
Options:
-h, --help Print out this help
-f, --filter Filter to a subset of checks
-t, --type Which set of checks? Defaults to 'status'
One of $types
-v, --verbose Show details of all checks, not just failed checks
Example:
sudo -u www-data php admin/cli/checks.php
sudo -u www-data php admin/cli/checks.php -v
sudo -u www-data php admin/cli/checks.php -v --filter=environment
";
if ($options['help']) {
echo $help;
die();
}
$filter = $options['filter'];
if ($filter) {
$checks = array_filter($checks, function($check, $key) use ($filter) {
$ref = $check->get_ref();
return (strpos($ref, $filter) !== false);
}, 1);
}
// These shell exit codes and labels align with the NRPE standard.
$exitcodes = [
result::NA => 0,
result::OK => 0,
result::INFO => 0,
result::UNKNOWN => 3,
result::WARNING => 1,
result::ERROR => 2,
result::CRITICAL => 2,
];
$exitlabel = [
result::NA => 'OK',
result::OK => 'OK',
result::INFO => 'OK',
result::UNKNOWN => 'UNKNOWN',
result::WARNING => 'WARNING',
result::ERROR => 'CRITICAL',
result::CRITICAL => 'CRITICAL',
];
$format = "% 10s| % -60s\n";
$spacer = "----------+--------------------------------------------------------------------\n";
$prefix = ' |';
$output = '';
$header = $exitlabel[result::OK] . ': ' . get_string('checksok', '', $options['type']) . "\n";
$exitcode = $exitcodes[result::OK];
foreach ($checks as $check) {
$ref = $check->get_ref();
$result = $check->get_result();
$status = $result->get_status();
$checkexitcode = $exitcodes[$status];
// Summary is treated as html.
$summary = $result->get_summary();
$summary = html_to_text($summary, 60, false);
if ($checkexitcode > $exitcode) {
$exitcode = $checkexitcode;
$header = $exitlabel[$status] . ': ' . $check->get_name() . " (" . $check->get_ref() . ")\n";
}
if (empty($messages[$status])) {
$messages[$status] = $result;
}
$len = strlen(get_string('status' . $status));
if ($options['verbose'] ||
$status == result::WARNING ||
$status == result::CRITICAL ||
$status == result::ERROR) {
$output .= sprintf(
$format,
$OUTPUT->check_result($result),
sprintf('%s (%s)', $check->get_name(), $ref)
);
$summary = str_replace("\n", "\n" . $prefix . ' ', $summary);
$output .= sprintf( $format, '', ' ' . $summary);
if ($options['verbose']) {
$actionlink = $check->get_action_link();
if ($actionlink) {
$output .= sprintf( $format, '', ' ' . $actionlink->url);
}
$output .= sprintf( $format, '', '');
}
}
}
// Print NRPE header.
print $header;
// Only show the table header if there is anything to show.
if ($output) {
print sprintf($format,
get_string('status'). ' ',
get_string('check')
) . $spacer;
print $output;
}
// NRPE shell exit code.
exit($exitcode);
+2 -20
View File
@@ -35,16 +35,8 @@ require_once($CFG->libdir.'/clilib.php'); // cli only functions
require_once($CFG->libdir.'/cronlib.php');
// now get cli options
list($options, $unrecognized) = cli_get_params(
array(
'help' => false,
'stop' => false,
),
array(
'h' => 'help',
's' => 'stop',
)
);
list($options, $unrecognized) = cli_get_params(array('help'=>false),
array('h'=>'help'));
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
@@ -57,7 +49,6 @@ if ($options['help']) {
Options:
-h, --help Print out this help
-s, --stop Notify all other running cron processes to stop after the current task
Example:
\$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -67,13 +58,4 @@ Example:
die;
}
if ($options['stop']) {
// By clearing the caches this signals to other running processes
// to exit after finishing the current task.
\core\task\manager::clear_static_caches();
die;
}
\core\local\cli\shutdown::script_supports_graceful_exit();
cron_run();
-138
View File
@@ -1,138 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Fix orphaned calendar events that were broken by MDL-67494.
*
* This script will look for all the calendar events which userids
* where broken by a wrong upgrade step, affecting to Moodle 3.9.5
* and up.
*
* It performs checks to both:
* a) Detect if the site was affected (ran the wrong upgrade step).
* b) Look for orphaned calendar events, categorising them as:
* - standard: site / category / course / group / user events
* - subscription: events created via subscriptions.
* - action: normal action events, created to show common important dates.
* - override: user and group override events, particular, that some activities support.
* - custom: other events, not being any of the above, common or particular.
* By specifying it (--fix) try to recover as many broken events (missing userid) as
* possible. Standard, subscription, action, override events in core are fully supported but
* override or custom events should be fixed by each plugin as far as there isn't any standard
* API (plugin-wise) to launch a rebuild of the calendar events.
*
* @package core
* @copyright 2021 onwards Simey Lameze <simey@moodle.com>
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('CLI_SCRIPT', true);
require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir . "/clilib.php");
require_once($CFG->libdir . '/db/upgradelib.php');
// Supported options.
$long = ['fix' => false, 'help' => false];
$short = ['f' => 'fix', 'h' => 'help'];
// CLI options.
[$options, $unrecognized] = cli_get_params($long, $short);
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
}
if ($options['help']) {
$help = <<<EOT
Fix orphaned calendar events.
This script detects calendar events that have had their
userid lost. By default it will perform various checks
and report them, showing the site status in an easy way.
Also, optionally (--fix), it wil try to recover as many
lost userids as possible from different sources. Note that
this script aims to process well-know events in core,
leaving custom events in 3rd part plugins mostly unmodified
because there isn't any consistent way to regenerate them.
For more details: https://tracker.moodle.org/browse/MDL-71156
Options:
-h, --help Print out this help.
-f, --fix Fix the orphaned calendar events in the DB.
If not specified only check and report problems to STDERR.
Usage:
- Only report: \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php
- Report and fix: \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php -f
EOT;
cli_writeln($help);
die;
}
// Check various usual pre-requisites.
if (empty($CFG->version)) {
cli_error('Database is not yet installed.');
}
$admin = get_admin();
if (!$admin) {
cli_error('Error: No admin account was found.');
}
if (moodle_needs_upgrading()) {
cli_error('Moodle upgrade pending, script execution suspended.');
}
// Do everything as admin by default.
\core\session\manager::set_user($admin);
// Report current site status.
cli_heading('Checking the site status');
$needsfix = upgrade_calendar_site_status();
// Report current calendar events status.
cli_heading('Checking the calendar events status');
$info = upgrade_calendar_events_status();
$hasbadevents = $info['total']->bad > 0 || $info['total']->bad != $info['other']->bad;
$needsfix = $needsfix || $hasbadevents;
// If, selected, fix as many calendar events as possible.
if ($options['fix']) {
// If the report has told us that the fix was not needed... ask for confirmation!
if (!$needsfix) {
cli_writeln("This site DOES NOT NEED to run the calendar events fix.");
$input = cli_input('Are you completely sure that you want to run the fix? (y/N)', 'N', ['y', 'Y', 'n', 'N']);
if (strtolower($input) != 'y') {
exit(0);
}
cli_writeln("");
}
cli_heading('Fixing as many as possible calendar events');
upgrade_calendar_events_fix_remaining($info);
// Report current (after fix) calendar events status.
cli_heading('Checking the calendar events status (after fix)');
upgrade_calendar_events_status();
} else if ($needsfix) {
// Fix option was not provided but problem events have been found. Notify the user and provide info how to fix these events.
cli_writeln("This site NEEDS to run the calendar events fix!");
cli_writeln("To fix the calendar events, re-run this script with the --fix option.");
}
+97 -107
View File
@@ -215,7 +215,6 @@ define('SITEID', 1);
//Database types
$databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
'auroramysql' => moodle_database::get_driver_instance('auroramysql', 'native'),
'mariadb'=> moodle_database::get_driver_instance('mariadb', 'native'),
'pgsql' => moodle_database::get_driver_instance('pgsql', 'native'),
'oci' => moodle_database::get_driver_instance('oci', 'native'),
@@ -267,7 +266,6 @@ list($options, $unrecognized) = cli_get_params(
);
$interactive = empty($options['non-interactive']);
$skipdatabase = $options['skip-database'];
// set up language
$lang = clean_param($options['lang'], PARAM_SAFEDIR);
@@ -639,100 +637,96 @@ do {
}
} while ($hintdatabase !== '');
// If --skip-database option is provided, we do not need to ask for site fullname, shortname, adminuser, adminpass, adminemail.
// These fields will be requested during the database install part.
if (!$skipdatabase) {
// Ask for fullname.
if ($interactive) {
cli_separator();
cli_heading(get_string('fullsitename', 'moodle'));
// ask for fullname
if ($interactive) {
cli_separator();
cli_heading(get_string('fullsitename', 'moodle'));
if ($options['fullname'] !== '') {
$prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
} else {
$prompt = get_string('clitypevalue', 'admin');
}
do {
$options['fullname'] = cli_input($prompt, $options['fullname']);
} while (empty($options['fullname']));
if ($options['fullname'] !== '') {
$prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
} else {
if (empty($options['fullname'])) {
$a = (object)['option' => 'fullname', 'value' => $options['fullname']];
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// Ask for shortname.
if ($interactive) {
cli_separator();
cli_heading(get_string('shortsitename', 'moodle'));
if ($options['shortname'] !== '') {
$prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
} else {
$prompt = get_string('clitypevalue', 'admin');
}
do {
$options['shortname'] = cli_input($prompt, $options['shortname']);
} while (empty($options['shortname']));
} else {
if (empty($options['shortname'])) {
$a = (object)['option' => 'shortname', 'value' => $options['shortname']];
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// Ask for admin user name.
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminusername', 'install'));
if (!empty($options['adminuser'])) {
$prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
} else {
$prompt = get_string('clitypevalue', 'admin');
}
do {
$options['adminuser'] = cli_input($prompt, $options['adminuser']);
} while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
} else {
if ((empty($options['adminuser']) || $options['adminuser'] === 'guest')) {
$a = (object)['option' => 'adminuser', 'value' => $options['adminuser']];
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// Ask for admin user password.
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminpassword', 'install'));
$prompt = get_string('clitypevalue', 'admin');
do {
$options['adminpass'] = cli_input($prompt);
} while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
} else {
if ((empty($options['adminpass']) or $options['adminpass'] === 'admin')) {
$a = (object)['option' => 'adminpass', 'value' => $options['adminpass']];
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// Ask for the admin email address.
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminemail', 'install'));
$prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
$options['adminemail'] = cli_input($prompt, $options['adminemail']);
}
// Validate that the address provided was an e-mail address.
if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
$a = (object)['option' => 'adminemail', 'value' => $options['adminemail']];
do {
$options['fullname'] = cli_input($prompt, $options['fullname']);
} while (empty($options['fullname']));
} else {
if (empty($options['fullname'])) {
$a = (object)array('option'=>'fullname', 'value'=>$options['fullname']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// ask for shortname
if ($interactive) {
cli_separator();
cli_heading(get_string('shortsitename', 'moodle'));
if ($options['shortname'] !== '') {
$prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
} else {
$prompt = get_string('clitypevalue', 'admin');
}
do {
$options['shortname'] = cli_input($prompt, $options['shortname']);
} while (empty($options['shortname']));
} else {
if (empty($options['shortname'])) {
$a = (object)array('option'=>'shortname', 'value'=>$options['shortname']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// ask for admin user name
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminusername', 'install'));
if (!empty($options['adminuser'])) {
$prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
} else {
$prompt = get_string('clitypevalue', 'admin');
}
do {
$options['adminuser'] = cli_input($prompt, $options['adminuser']);
} while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
} else {
if (empty($options['adminuser']) or $options['adminuser'] === 'guest') {
$a = (object)array('option'=>'adminuser', 'value'=>$options['adminuser']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// ask for admin user password
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminpassword', 'install'));
$prompt = get_string('clitypevalue', 'admin');
do {
$options['adminpass'] = cli_input($prompt);
} while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
} else {
if (empty($options['adminpass']) or $options['adminpass'] === 'admin') {
$a = (object)array('option'=>'adminpass', 'value'=>$options['adminpass']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
}
// Ask for the admin email address.
if ($interactive) {
cli_separator();
cli_heading(get_string('cliadminemail', 'install'));
$prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
$options['adminemail'] = cli_input($prompt, $options['adminemail']);
}
// Validate that the address provided was an e-mail address.
if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
$a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
// Ask for the upgrade key.
if ($interactive) {
cli_separator();
@@ -751,27 +745,23 @@ if ($options['upgradekey'] !== '') {
$CFG->upgradekey = $options['upgradekey'];
}
// The user does not also need to pass agree-license when --skip-database is provided as the user will need to accept
// the license again in the database install part.
if (!$skipdatabase) {
if ($interactive) {
if (!$options['agree-license']) {
cli_separator();
cli_heading(get_string('copyrightnotice'));
echo "Moodle - Modular Object-Oriented Dynamic Learning Environment\n";
echo get_string('gpl3')."\n\n";
echo get_string('doyouagree')."\n";
$prompt = get_string('cliyesnoprompt', 'admin');
$input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
if ($input == get_string('clianswerno', 'admin')) {
exit(1);
}
}
} else {
if (!$options['agree-license'] && !$skipdatabase) {
cli_error(get_string('climustagreelicense', 'install'));
if ($interactive) {
if (!$options['agree-license']) {
cli_separator();
cli_heading(get_string('copyrightnotice'));
echo "Moodle - Modular Object-Oriented Dynamic Learning Environment\n";
echo get_string('gpl3')."\n\n";
echo get_string('doyouagree')."\n";
$prompt = get_string('cliyesnoprompt', 'admin');
$input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
if ($input == get_string('clianswerno', 'admin')) {
exit(1);
}
}
} else {
if (!$options['agree-license']) {
cli_error(get_string('climustagreelicense', 'install'));
}
}
// Finally we have all info needed for config.php
@@ -819,7 +809,7 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
cli_error(get_string('pluginschecktodo', 'admin'));
}
if (!$skipdatabase) {
if (!$options['skip-database']) {
install_cli_database($options, $interactive);
// This needs to happen at the end to ensure it occurs after all caches
// have been purged for the last time.
+8 -8
View File
@@ -119,7 +119,7 @@ if (!empty($options['collation'])) {
if ($dbcollation->value !== $collation || $dbcharset->value !== $charset) {
// Try to convert the DB.
echo "Converting database to '$collation' for $CFG->wwwroot:\n";
$sql = "ALTER DATABASE `$CFG->dbname` DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
$sql = "ALTER DATABASE $CFG->dbname DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
try {
$DB->change_database_structure($sql);
} catch (exception $e) {
@@ -146,7 +146,7 @@ if (!empty($options['collation'])) {
} else {
try {
$DB->change_database_structure("ALTER TABLE `$table->name` CONVERT TO CHARACTER SET $charset COLLATE $collation");
$DB->change_database_structure("ALTER TABLE $table->name CONVERT TO CHARACTER SET $charset COLLATE $collation");
echo "CONVERTED\n";
$converted++;
} catch (ddl_exception $e) {
@@ -163,7 +163,7 @@ if (!empty($options['collation'])) {
}
}
$sql = "SHOW FULL COLUMNS FROM `$table->name` WHERE collation IS NOT NULL";
$sql = "SHOW FULL COLUMNS FROM $table->name WHERE collation IS NOT NULL";
$rs2 = $DB->get_recordset_sql($sql);
foreach ($rs2 as $column) {
$column = (object)array_change_key_case((array)$column, CASE_LOWER);
@@ -181,7 +181,7 @@ if (!empty($options['collation'])) {
$notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
$default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
// primary, unique and inc are not supported for texts
$sql = "ALTER TABLE `$table->name`
$sql = "ALTER TABLE $table->name
MODIFY COLUMN $column->field $column->type
CHARACTER SET $charset
COLLATE $collation $notnull $default";
@@ -192,11 +192,11 @@ if (!empty($options['collation'])) {
$default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
if ($rowformat != '') {
$sql = "ALTER TABLE `$table->name` $rowformat";
$sql = "ALTER TABLE $table->name $rowformat";
$DB->change_database_structure($sql);
}
$sql = "ALTER TABLE `$table->name`
$sql = "ALTER TABLE $table->name
MODIFY COLUMN $column->field $column->type
CHARACTER SET $charset
COLLATE $collation $notnull $default";
@@ -315,8 +315,8 @@ function mysql_set_row_format($tablename, $charset, $collation, $engine) {
if ($rs->row_format == 'Compact' || $rs->row_format == 'Redundant') {
$rowformat = $DB->get_row_format_sql($engine, $collation);
// Try to convert to compressed format and then try updating the collation again.
$DB->change_database_structure("ALTER TABLE `$tablename` $rowformat");
$DB->change_database_structure("ALTER TABLE `$tablename` CONVERT TO CHARACTER SET $charset COLLATE $collation");
$DB->change_database_structure("ALTER TABLE $tablename $rowformat");
$DB->change_database_structure("ALTER TABLE $tablename CONVERT TO CHARACTER SET $charset COLLATE $collation");
} else {
// Row format may not be the problem. Can not diagnose problem. Send fail reply.
return false;
+2 -2
View File
@@ -158,7 +158,7 @@ if (!empty($options['info'])) {
}
foreach ($fixtables as $table) {
$DB->change_database_structure("ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed");
$DB->change_database_structure("ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed");
echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
}
@@ -189,7 +189,7 @@ if (!empty($options['info'])) {
echo "SET GLOBAL innodb_file_per_table=1;\n";
echo "SET GLOBAL innodb_file_format=Barracuda;\n";
foreach ($fixtables as $table) {
echo "ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed;\n";
echo "ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed;\n";
}
echo "\n";
exit(0);
-151
View File
@@ -1,151 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* CLI task execution.
*
* @package core
* @subpackage cli
* @copyright 2014 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('CLI_SCRIPT', true);
require(__DIR__ . '/../../config.php');
require_once("$CFG->libdir/clilib.php");
require_once("$CFG->libdir/cronlib.php");
list($options, $unrecognized) = cli_get_params(
array('help' => false, 'list' => false, 'execute' => false, 'showsql' => false, 'showdebugging' => false),
array('h' => 'help')
);
if ($unrecognized) {
$unrecognized = implode("\n ", $unrecognized);
cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
}
if ($options['help'] or (!$options['list'] and !$options['execute'])) {
$help =
"Scheduled cron tasks.
Options:
--execute=\\some\\task Execute scheduled task manually
--list List all scheduled tasks
--showsql Show sql queries before they are executed
--showdebugging Show developer level debugging information
-h, --help Print out this help
Example:
\$sudo -u www-data /usr/bin/php admin/cli/scheduled_task.php --execute=\\core\\task\\session_cleanup_task
";
echo $help;
die;
}
if ($options['showdebugging']) {
set_debugging(DEBUG_DEVELOPER, true);
}
if ($options['showsql']) {
$DB->set_debug(true);
}
if ($options['list']) {
cli_heading("List of scheduled tasks ($CFG->wwwroot)");
$shorttime = get_string('strftimedatetimeshort');
$tasks = \core\task\manager::get_all_scheduled_tasks();
echo str_pad(get_string('scheduledtasks', 'tool_task'), 50, ' ') . ' ' . str_pad(get_string('runpattern', 'tool_task'), 17, ' ')
. ' ' . str_pad(get_string('lastruntime', 'tool_task'), 40, ' ') . get_string('nextruntime', 'tool_task') . "\n";
foreach ($tasks as $task) {
$class = '\\' . get_class($task);
$schedule = $task->get_minute() . ' '
. $task->get_hour() . ' '
. $task->get_day() . ' '
. $task->get_day_of_week() . ' '
. $task->get_month() . ' '
. $task->get_day_of_week();
$nextrun = $task->get_next_run_time();
$lastrun = $task->get_last_run_time();
$plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
$plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
if ($plugindisabled) {
$nextrun = get_string('plugindisabled', 'tool_task');
} else if ($task->get_disabled()) {
$nextrun = get_string('taskdisabled', 'tool_task');
} else if ($nextrun > time()) {
$nextrun = userdate($nextrun);
} else {
$nextrun = get_string('asap', 'tool_task');
}
if ($lastrun) {
$lastrun = userdate($lastrun);
} else {
$lastrun = get_string('never');
}
echo str_pad($class, 50, ' ') . ' ' . str_pad($schedule, 17, ' ') .
' ' . str_pad($lastrun, 40, ' ') . ' ' . $nextrun . "\n";
}
exit(0);
}
if ($execute = $options['execute']) {
if (!$task = \core\task\manager::get_scheduled_task($execute)) {
mtrace("Task '$execute' not found");
exit(1);
}
if (moodle_needs_upgrading()) {
mtrace("Moodle upgrade pending, cannot execute tasks.");
exit(1);
}
// Increase memory limit.
raise_memory_limit(MEMORY_EXTRA);
// Emulate normal session - we use admin account by default.
cron_setup_user();
// Execute the task.
\core\local\cli\shutdown::script_supports_graceful_exit();
$cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
mtrace('Cannot obtain cron lock');
exit(129);
}
if (!$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10)) {
$cronlock->release();
mtrace('Cannot obtain task lock');
exit(130);
}
$task->set_lock($lock);
if (!$task->is_blocking()) {
$cronlock->release();
} else {
$task->set_cron_lock($cronlock);
}
cron_run_inner_scheduled_task($task);
}
+2 -10
View File
@@ -34,7 +34,6 @@ $help = "Command line tool to uninstall plugins.
Options:
-h --help Print this help.
--show-all Displays a list of all installed plugins.
--show-contrib Displays a list of all third-party installed plugins.
--show-missing Displays a list of plugins missing from disk.
--purge-missing Uninstall all missing from disk plugins.
--plugins=<plugin name> A comma separated list of plugins to be uninstalled. E.g. mod_assign,mod_forum
@@ -45,9 +44,6 @@ Examples:
# php uninstall_plugins.php --show-all
Prints tab-separated list of all installed plugins.
# php uninstall_plugins.php --show-contrib
Prints tab-separated list of all third-party installed plugins.
# php uninstall_plugins.php --show-missing
Prints tab-separated list of all missing from disk plugins.
@@ -67,7 +63,6 @@ Examples:
list($options, $unrecognised) = cli_get_params([
'help' => false,
'show-all' => false,
'show-contrib' => false,
'show-missing' => false,
'purge-missing' => false,
'plugins' => false,
@@ -89,15 +84,12 @@ if ($options['help']) {
$pluginman = core_plugin_manager::instance();
$plugininfo = $pluginman->get_plugins();
if ($options['show-all'] || $options['show-missing'] || $options['show-contrib']) {
if ($options['show-all'] || $options['show-missing']) {
foreach ($plugininfo as $type => $plugins) {
foreach ($plugins as $name => $plugin) {
if ($options['show-contrib'] && $plugin->is_standard()) {
continue;
}
$pluginstring = $plugin->component . "\t" . $plugin->displayname;
if ($options['show-all'] || $options['show-contrib']) {
if ($options['show-all']) {
cli_writeln($pluginstring);
} else {
if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+1 -1
View File
@@ -137,7 +137,7 @@ if (!$envstatus) {
// Test plugin dependencies.
$failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
cli_error(get_string('pluginschecktodo', 'admin'));
}
-84
View File
@@ -1,84 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Content bank and its plugins settings.
*
* @package core
* @subpackage contentbank
* @copyright 2020 Amaia Anabitarte <amaia@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once('../config.php');
require_once($CFG->libdir.'/adminlib.php');
$action = required_param('action', PARAM_ALPHANUMEXT);
$name = required_param('name', PARAM_PLUGIN);
$syscontext = context_system::instance();
$PAGE->set_url('/admin/contentbank.php');
$PAGE->set_context($syscontext);
require_admin();
require_sesskey();
$return = new moodle_url('/admin/settings.php', array('section' => 'managecontentbanktypes'));
$plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
$sortorder = array_flip(array_keys($plugins));
if (!isset($plugins[$name])) {
print_error('contenttypenotfound', 'error', $return, $name);
}
switch ($action) {
case 'disable':
if ($plugins[$name]->is_enabled()) {
set_config('disabled', 1, 'contentbank_'. $name);
}
break;
case 'enable':
if (!$plugins[$name]->is_enabled()) {
unset_config('disabled', 'contentbank_'. $name);
}
break;
case 'up':
if ($sortorder[$name]) {
$currentindex = $sortorder[$name];
$seq = array_keys($plugins);
$seq[$currentindex] = $seq[$currentindex - 1];
$seq[$currentindex - 1] = $name;
set_config('contentbank_plugins_sortorder', implode(',', $seq));
}
break;
case 'down':
if ($sortorder[$name] < count($sortorder) - 1) {
$currentindex = $sortorder[$name];
$seq = array_keys($plugins);
$seq[$currentindex] = $seq[$currentindex + 1];
$seq[$currentindex + 1] = $name;
set_config('contentbank_plugins_sortorder', implode(',', $seq));
}
break;
}
core_plugin_manager::reset_caches();
$cache = cache::make('core', 'contentbank_enabled_extensions');
$cache->purge();
$cache = cache::make('core', 'contentbank_context_extensions');
$cache->purge();
redirect($return);
File diff suppressed because it is too large Load Diff
+8 -18
View File
@@ -241,7 +241,7 @@ if (!core_tables_exist()) {
// check plugin dependencies
$failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
$PAGE->navbar->add(get_string('pluginscheck', 'admin'));
$PAGE->set_title($strinstallation);
$PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
@@ -508,9 +508,8 @@ if (!$cache and $version > $CFG->version) { // upgrade
} else {
// Always verify plugin dependencies!
$failed = array();
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
die();
}
unset($failed);
@@ -700,10 +699,9 @@ if (!$cache and moodle_needs_upgrading()) {
// Make sure plugin dependencies are always checked.
$failed = array();
if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
if (!$pluginman->all_plugins_ok($version, $failed)) {
$output = $PAGE->get_renderer('core', 'admin');
echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
array('confirmplugincheck' => 0)));
echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
die();
}
unset($failed);
@@ -845,9 +843,8 @@ $errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
$lastcron = get_config('tool_task', 'lastcronstart');
$cronoverdue = ($lastcron < time() - 3600 * 24);
$lastcroninterval = get_config('tool_task', 'lastcroninterval');
$expectedfrequency = $CFG->expectedcronfrequency ?? MINSECS;
$croninfrequent = !$cronoverdue && ($lastcroninterval > ($expectedfrequency + MINSECS) || $lastcron < time() - $expectedfrequency);
$expectedfrequency = $CFG->expectedcronfrequency ?? 200;
$croninfrequent = !$cronoverdue && ($lastcroninterval > $expectedfrequency || $lastcron < time() - $expectedfrequency);
$dbproblems = $DB->diagnose();
$maintenancemode = !empty($CFG->maintenance_enabled);
@@ -901,12 +898,6 @@ if (empty($CFG->disabledevlibdirscheck) && (is_dir($CFG->dirroot.'/vendor') || i
// Check if the site is being foced onto ssl.
$overridetossl = !empty($CFG->overridetossl);
// Check if moodle campaign content setting is enabled or not.
$showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaigncontent;
// Encourage admins to enable the user feedback feature if it is not enabled already.
$showfeedbackencouragement = empty($CFG->enableuserfeedback);
admin_externalpage_setup('adminnotifications');
$output = $PAGE->get_renderer('core', 'admin');
@@ -914,5 +905,4 @@ $output = $PAGE->get_renderer('core', 'admin');
echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
$maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
$registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
$mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent,
$showcampaigncontent, $showfeedbackencouragement);
$mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent);
@@ -1,4 +1,5 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
@@ -15,32 +16,41 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* License manager page.
*
* @package tool_licensemanager
* @copyright 2019 Tom Dickman <tomdickman@catalyst-au.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* Allows admin to configure licenses.
*/
require_once('../../../config.php');
require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->libdir . '/licenselib.php');
require_once('../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/licenselib.php');
require_admin();
$returnurl = \tool_licensemanager\helper::get_licensemanager_url();
$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managelicenses";
$action = optional_param('action', '', PARAM_ALPHANUMEXT);
$license = optional_param('license', '', PARAM_SAFEDIR);
////////////////////////////////////////////////////////////////////////////////
// process actions
if (!confirm_sesskey()) {
redirect($returnurl);
}
// Route via the manager.
$licensemanager = new \tool_licensemanager\manager();
$PAGE->set_context(context_system::instance());
$PAGE->set_url(\tool_licensemanager\helper::get_licensemanager_url());
$PAGE->set_title(get_string('licensemanager', 'tool_licensemanager'));
$return = true;
switch ($action) {
case 'disable':
license_manager::disable($license);
break;
$licensemanager->execute($action, $license);
case 'enable':
license_manager::enable($license);
break;
default:
break;
}
if ($return) {
redirect ($returnurl);
}
+2 -10
View File
@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir.'/adminlib.php');
include_once($CFG->dirroot.'/mnet/lib.php');
$sort = optional_param('sort', 'username', PARAM_ALPHAEXT);
$sort = optional_param('sort', 'username', PARAM_ALPHA);
$dir = optional_param('dir', 'ASC', PARAM_ALPHA);
$page = optional_param('page', 0, PARAM_INT);
$perpage = optional_param('perpage', 30, PARAM_INT);
@@ -153,15 +153,7 @@ foreach ($columns as $column) {
$headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
}
$headings['delete'] = '';
$sortorder = get_safe_orderby([
'username' => 'username',
'mnet_host_id' => 'mnet_host_id',
'access' => 'accessctrl',
'default' => 'username',
], $sort, $dir, false);
$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
$aclcount = $DB->count_records('mnet_sso_access_control');
if (!$acl) {
+1 -1
View File
@@ -156,7 +156,7 @@ class mnet_review_host_form extends moodleform {
if ($mnet_peer && !empty($mnet_peer->deleted)) {
$radioarray = array();
$radioarray[] = $mform->createElement('static', 'deletedinfo', '',
$OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'alert alert-warning'));
$OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
$radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
$radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
$mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
+2 -4
View File
@@ -49,7 +49,6 @@
array($module->id));
core_plugin_manager::reset_caches();
admin_get_root(true, false); // settings not required - only pages
redirect(new moodle_url('/admin/modules.php'));
}
if (!empty($show) and confirm_sesskey()) {
@@ -67,7 +66,6 @@
array($module->id));
core_plugin_manager::reset_caches();
admin_get_root(true, false); // settings not required - only pages
redirect(new moodle_url('/admin/modules.php'));
}
echo $OUTPUT->header();
@@ -123,8 +121,8 @@
$count = -1;
}
if ($count>0) {
$countlink = $OUTPUT->action_link(new moodle_url('/course/search.php', ['modulelist' => $module->name]),
$count, null, ['title' => $strshowmodulecourse]);
$countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
"&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
} else if ($count < 0) {
$countlink = get_string('error');
} else {
+1 -1
View File
@@ -53,6 +53,7 @@ $pageurl = new moodle_url('/admin/plugins.php', $pageparams);
$pluginman = core_plugin_manager::instance();
if ($uninstall) {
require_sesskey();
if (!$confirmed) {
admin_externalpage_setup('pluginsoverview', '', $pageparams);
@@ -91,7 +92,6 @@ if ($uninstall) {
exit();
} else {
require_sesskey();
$SESSION->pluginuninstallreturn = $pluginfo->get_return_url_after_uninstall($return);
$progress = new progress_trace_buffer(new text_progress_trace(), false);
$pluginman->uninstall_plugin($pluginfo->component, $progress);
+1 -1
View File
@@ -170,7 +170,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
if ($version) {
$row[] = $version;
} else {
$row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
$row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
}
// Other question types required by this one.
+1 -1
View File
@@ -172,7 +172,7 @@ foreach ($sortedqtypes as $qtypename => $localname) {
if ($version) {
$row[] = $version;
} else {
$row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
$row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
}
// Other question types required by this one.
+50 -106
View File
@@ -253,7 +253,7 @@ class core_admin_renderer extends plugin_renderer_base {
$out .= $this->output->container(get_string('cancelinstallinfodir', 'core_plugin', $pluginfo->rootdir));
if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
$out .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
'alert alert-warning mt-2');
'uninstalldeleteconfirmexternal');
}
}
@@ -282,8 +282,6 @@ class core_admin_renderer extends plugin_renderer_base {
* @param bool $overridetossl Whether or not ssl is being forced.
* @param bool $invalidforgottenpasswordurl Whether the forgotten password URL does not link to a valid URL.
* @param bool $croninfrequent If true, warn that cron hasn't run in the past few minutes
* @param bool $showcampaigncontent Whether the campaign content should be visible or not.
* @param bool $showfeedbackencouragement Whether the feedback encouragement content should be displayed or not.
*
* @return string HTML to output.
*/
@@ -291,9 +289,7 @@ class core_admin_renderer extends plugin_renderer_base {
$cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
$buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
$themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
$overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false,
$showcampaigncontent = false, bool $showfeedbackencouragement = false) {
$overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false) {
global $CFG;
$output = '';
@@ -316,8 +312,6 @@ class core_admin_renderer extends plugin_renderer_base {
$output .= $this->registration_warning($registered);
$output .= $this->mobile_configuration_warning($mobileconfigured);
$output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
$output .= $this->userfeedback_encouragement($showfeedbackencouragement);
$output .= $this->campaign_content($showcampaigncontent);
//////////////////////////////////////////////////////////////////////////////////////////////////
//// IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
@@ -439,7 +433,7 @@ class core_admin_renderer extends plugin_renderer_base {
if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
$confirm .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
'alert alert-warning mt-2');
'uninstalldeleteconfirmexternal');
}
// After any uninstall we must execute full upgrade to finish the cleanup!
@@ -518,7 +512,7 @@ class core_admin_renderer extends plugin_renderer_base {
* @return string HTML to output.
*/
protected function warning($message, $type = 'warning') {
return $this->box($message, 'generalbox alert alert-' . $type);
return $this->box($message, 'generalbox admin' . $type);
}
/**
@@ -533,7 +527,7 @@ class core_admin_renderer extends plugin_renderer_base {
return $this->warning(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));
} else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'danger');
return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'error');
} else {
return '';
@@ -551,7 +545,7 @@ class core_admin_renderer extends plugin_renderer_base {
if ($devlibdir) {
$moreinfo = new moodle_url('/report/security/index.php');
$warning = get_string('devlibdirpresent', 'core_admin', ['moreinfourl' => $moreinfo->out()]);
return $this->warning($warning, 'danger');
return $this->warning($warning, 'error');
} else {
return '';
@@ -608,9 +602,19 @@ class core_admin_renderer extends plugin_renderer_base {
return '';
}
$check = new \tool_task\check\cronrunning();
$result = $check->get_result();
return $this->warning($result->get_summary() . '&nbsp;' . $this->help_icon('cron', 'admin'));
if (empty($CFG->cronclionly)) {
$url = new moodle_url('/admin/cron.php');
if (!empty($CFG->cronremotepassword)) {
$url = new moodle_url('/admin/cron.php', array('password' => $CFG->cronremotepassword));
}
return $this->warning(get_string('cronwarning', 'admin', $url->out()) . '&nbsp;' .
$this->help_icon('cron', 'admin'));
}
// $CFG->cronclionly is not empty: cron can run only from CLI.
return $this->warning(get_string('cronwarningcli', 'admin') . '&nbsp;' .
$this->help_icon('cron', 'admin'));
}
/**
@@ -626,9 +630,9 @@ class core_admin_renderer extends plugin_renderer_base {
return '';
}
$check = new \tool_task\check\cronrunning();
$result = $check->get_result();
return $this->warning($result->get_summary() . '&nbsp;' . $this->help_icon('cron', 'admin'));
$expectedfrequency = $CFG->expectedcronfrequency ?? 200;
return $this->warning(get_string('croninfrequent', 'admin', $expectedfrequency) . '&nbsp;' .
$this->help_icon('cron', 'admin'));
}
/**
@@ -718,7 +722,7 @@ class core_admin_renderer extends plugin_renderer_base {
return $this->warning(
$this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
$this->container($this->doc_link('admin/versions', get_string('morehelp'))),
'danger');
'error');
}
/*
@@ -734,7 +738,7 @@ class core_admin_renderer extends plugin_renderer_base {
}
$warning = (get_string('testsiteupgradewarning', 'admin', $testsite));
return $this->warning($warning, 'danger');
return $this->warning($warning, 'error');
}
/**
@@ -769,7 +773,7 @@ class core_admin_renderer extends plugin_renderer_base {
$level = 'warning';
if ($maturity == MATURITY_ALPHA) {
$level = 'danger';
$level = 'error';
}
$maturitylevel = get_string('maturity' . $maturity, 'admin');
@@ -884,20 +888,6 @@ class core_admin_renderer extends plugin_renderer_base {
return $output;
}
/**
* Display campaign content.
*
* @param bool $showcampaigncontent Whether the campaign content should be visible or not.
* @return string the campaign content raw html.
*/
protected function campaign_content(bool $showcampaigncontent): string {
if (!$showcampaigncontent) {
return '';
}
return $this->render_from_template('core/campaign_content', ['lang' => current_language()]);
}
/**
* Display a warning about the forgotten password URL not linking to a valid URL.
*
@@ -966,7 +956,7 @@ class core_admin_renderer extends plugin_renderer_base {
protected function release_notes_link() {
$releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
$releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
return $this->box($releasenoteslink, 'generalbox alert alert-info');
return $this->box($releasenoteslink, 'generalbox releasenoteslink');
}
/**
@@ -995,7 +985,7 @@ class core_admin_renderer extends plugin_renderer_base {
* @return string HTML code
*/
public function plugins_check_table(core_plugin_manager $pluginman, $version, array $options = array()) {
global $CFG;
$plugininfo = $pluginman->get_plugins();
if (empty($plugininfo)) {
@@ -1081,10 +1071,8 @@ class core_admin_renderer extends plugin_renderer_base {
}
$coredependency = $plugin->is_core_dependency_satisfied($version);
$incompatibledependency = $plugin->is_core_compatible_satisfied($CFG->branch);
$otherpluginsdependencies = $pluginman->are_dependencies_satisfied($plugin->get_other_required_plugins());
$dependenciesok = $coredependency && $otherpluginsdependencies && $incompatibledependency;
$dependenciesok = $coredependency && $otherpluginsdependencies;
$statuscode = $plugin->get_status();
$row->attributes['class'] .= ' status-' . $statuscode;
@@ -1110,7 +1098,7 @@ class core_admin_renderer extends plugin_renderer_base {
if (!empty($installabortable[$plugin->component])) {
$status .= $this->output->single_button(
new moodle_url($this->page->url, array('abortinstall' => $plugin->component, 'confirmplugincheck' => 0)),
new moodle_url($this->page->url, array('abortinstall' => $plugin->component)),
get_string('cancelinstallone', 'core_plugin'),
'post',
array('class' => 'actionbutton cancelinstallone d-block mt-1')
@@ -1134,11 +1122,8 @@ class core_admin_renderer extends plugin_renderer_base {
}
$status = new html_table_cell($sourcelabel.' '.$status);
if ($plugin->pluginsupported != null) {
$requires = new html_table_cell($this->required_column($plugin, $pluginman, $version, $CFG->branch));
} else {
$requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));
}
$requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));
$statusisboring = in_array($statuscode, array(
core_plugin_manager::PLUGIN_STATUS_NODB, core_plugin_manager::PLUGIN_STATUS_UPTODATE));
@@ -1209,7 +1194,7 @@ class core_admin_renderer extends plugin_renderer_base {
if ($installabortable) {
$out .= $this->output->single_button(
new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)),
new moodle_url($this->page->url, array('abortinstallx' => 1)),
get_string('cancelinstallall', 'core_plugin', count($installabortable)),
'post',
array('class' => 'singlebutton cancelinstallall mr-1')
@@ -1474,17 +1459,15 @@ class core_admin_renderer extends plugin_renderer_base {
* @param \core\plugininfo\base $plugin the plugin we are rendering the row for.
* @param core_plugin_manager $pluginman provides data on all the plugins.
* @param string $version
* @param int $branch the current Moodle branch
* @return string HTML code
*/
protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version, $branch = null) {
protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version) {
$requires = array();
$displayuploadlink = false;
$displayupdateslink = false;
$requirements = $pluginman->resolve_requirements($plugin, $version, $branch);
foreach ($requirements as $reqname => $reqinfo) {
foreach ($pluginman->resolve_requirements($plugin, $version) as $reqname => $reqinfo) {
if ($reqname === 'core') {
if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OK) {
$class = 'requires-ok text-muted';
@@ -1493,19 +1476,7 @@ class core_admin_renderer extends plugin_renderer_base {
$class = 'requires-failed';
$label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
}
if ($branch != null && !$plugin->is_core_compatible_satisfied($branch)) {
$requires[] = html_writer::tag('li',
html_writer::span(get_string('incompatibleversion', 'core_plugin', $branch), 'dep dep-core').
' '.$label, array('class' => $class));
} else if ($branch != null && $plugin->pluginsupported != null) {
$requires[] = html_writer::tag('li',
html_writer::span(get_string('moodlebranch', 'core_plugin',
array('min' => $plugin->pluginsupported[0], 'max' => $plugin->pluginsupported[1])), 'dep dep-core').
' '.$label, array('class' => $class));
} else if ($reqinfo->reqver != ANY_VERSION) {
if ($reqinfo->reqver != ANY_VERSION) {
$requires[] = html_writer::tag('li',
html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
' '.$label, array('class' => $class));
@@ -1594,13 +1565,6 @@ class core_admin_renderer extends plugin_renderer_base {
);
}
// Check if supports is present, and $branch is not in, only if $incompatible check was ok.
if ($plugin->pluginsupported != null && $class == 'requires-ok' && $branch != null) {
if ($pluginman->check_explicitly_supported($plugin, $branch) == $pluginman::VERSION_NOT_SUPPORTED) {
$out .= html_writer::div(get_string('notsupported', 'core_plugin', $branch));
}
}
return $out;
}
@@ -1616,18 +1580,12 @@ class core_admin_renderer extends plugin_renderer_base {
$plugininfo = $pluginman->get_plugins();
$numtotal = $numextension = $numupdatable = $numinstallable = 0;
$numtotal = $numextension = $numupdatable = 0;
foreach ($plugininfo as $type => $plugins) {
foreach ($plugins as $name => $plugin) {
if ($res = $plugin->available_updates()) {
if ($plugin->available_updates()) {
$numupdatable++;
foreach ($res as $updateinfo) {
if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
$numinstallable++;
break;
}
}
}
if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
continue;
@@ -1670,13 +1628,16 @@ class core_admin_renderer extends plugin_renderer_base {
$out .= $this->output->heading(get_string('overviewext', 'core_plugin'), 3);
}
if ($numinstallable) {
$out .= $this->output->single_button(
new moodle_url($this->page->url, array('installupdatex' => 1)),
get_string('updateavailableinstallall', 'core_admin', $numinstallable),
'post',
array('class' => 'singlebutton updateavailableinstallall')
);
if ($numupdatable) {
$installableupdates = $pluginman->filter_installable($pluginman->available_updates());
if ($installableupdates) {
$out .= $this->output->single_button(
new moodle_url($this->page->url, array('installupdatex' => 1)),
get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
'post',
array('class' => 'singlebutton updateavailableinstallall')
);
}
}
$out .= html_writer::div($infoall, 'info info-all').
@@ -1910,7 +1871,7 @@ class core_admin_renderer extends plugin_renderer_base {
'infos'
);
if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason)) {
$box .= $this->output->single_button(
new moodle_url($this->page->url, array('installupdate' => $updateinfo->component,
'installupdateversion' => $updateinfo->version)),
@@ -1950,7 +1911,7 @@ class core_admin_renderer extends plugin_renderer_base {
get_string('status'),
);
$servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status');
$servertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
$servertable->attributes['class'] = 'admintable environmenttable generaltable';
$servertable->id = 'serverstatus';
$serverdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -1963,7 +1924,7 @@ class core_admin_renderer extends plugin_renderer_base {
get_string('status'),
);
$othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status');
$othertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
$othertable->attributes['class'] = 'admintable environmenttable generaltable';
$othertable->id = 'otherserverstatus';
$otherdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -2183,21 +2144,4 @@ class core_admin_renderer extends plugin_renderer_base {
return $this->output->box($out);
}
/**
* Display message about benefits of enabling the user feedback feature.
*
* @param bool $showfeedbackencouragement Whether the encouragement content should be displayed or not
* @return string
*/
protected function userfeedback_encouragement(bool $showfeedbackencouragement): string {
$output = '';
if ($showfeedbackencouragement) {
$settingslink = new moodle_url('/admin/settings.php', ['section' => 'userfeedback']);
$output .= $this->warning(get_string('userfeedbackencouragement', 'admin', $settingslink->out()), 'info');
}
return $output;
}
}
@@ -43,7 +43,7 @@ abstract class core_role_capability_table_base {
protected $id;
/** Added to the class="" attribute on output. */
protected $classes = array('rolecap table-hover');
protected $classes = array('rolecap');
/** Default number of capabilities in the table for the search UI to be shown. */
const NUM_CAPS_FOR_SEARCH = 12;
@@ -50,7 +50,6 @@ class core_role_check_capability_table extends core_role_capability_table_base {
$this->contextname = $contextname;
$this->stryes = get_string('yes');
$this->strno = get_string('no');
$this->add_classes(['table-striped']);
}
protected function add_header_cells() {
@@ -55,7 +55,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
foreach ($levels as $level => $classname) {
$this->allcontextlevels[$level] = context_helper::get_level_name($level);
}
$this->add_classes(['table-striped']);
}
protected function load_current_permissions() {
@@ -66,9 +66,9 @@ class core_role_override_permissions_table_advanced extends core_role_capability
$rowattributes = parent::get_row_attributes($capability);
if ($this->permissions[$capability->name] !== 0) {
if (empty($rowattributes['class'])) {
$rowattributes['class'] = "overriddenpermission table-warning";
$rowattributes['class'] = "overriddenpermission";
} else {
$rowattributes['class'] .= " overriddenpermission table-warning";
$rowattributes['class'] .= " overriddenpermission";
}
}
return $rowattributes;
+8 -3
View File
@@ -131,10 +131,15 @@ if ($hassiteconfig && \core_analytics\manager::is_analytics_enabled()) {
$timesplittingdefaults, $timesplittingoptions)
);
// Predictions processor output dir - specify default in setting description (used if left blank).
$defaultmodeloutputdir = \core_analytics\model::default_output_dir();
// Predictions processor output dir.
$defaultmodeloutputdir = rtrim($CFG->dataroot, '/') . DIRECTORY_SEPARATOR . 'models';
if (empty(get_config('analytics', 'modeloutputdir')) && !file_exists($defaultmodeloutputdir) &&
is_writable($defaultmodeloutputdir)) {
// Automatically create the dir for them so users don't see the invalid value red cross.
mkdir($defaultmodeloutputdir, $CFG->directorypermissions, true);
}
$settings->add(new admin_setting_configdirectory('analytics/modeloutputdir', new lang_string('modeloutputdir', 'analytics'),
new lang_string('modeloutputdirwithdefaultinfo', 'analytics', $defaultmodeloutputdir), ''));
new lang_string('modeloutputdirinfo', 'analytics'), $defaultmodeloutputdir));
// Disable web interface evaluation and get predictions.
$settings->add(new admin_setting_configcheckbox('analytics/onlycli', new lang_string('onlycli', 'analytics'),
-6
View File
@@ -25,12 +25,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
$temp->add(new admin_setting_configcheckbox('allowcohortthemes', new lang_string('allowcohortthemes', 'admin'), new lang_string('configallowcohortthemes', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('allowthemechangeonurl', new lang_string('allowthemechangeonurl', 'admin'), new lang_string('configallowthemechangeonurl', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('allowuserblockhiding', new lang_string('allowuserblockhiding', 'admin'), new lang_string('configallowuserblockhiding', 'admin'), 1));
$temp->add(new admin_setting_configcheckbox('langmenuinsecurelayout',
new lang_string('langmenuinsecurelayout', 'admin'),
new lang_string('langmenuinsecurelayout_desc', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('logininfoinsecurelayout',
new lang_string('logininfoinsecurelayout', 'admin'),
new lang_string('logininfoinsecurelayout_desc', 'admin'), 0));
$temp->add(new admin_setting_configtextarea('custommenuitems', new lang_string('custommenuitems', 'admin'),
new lang_string('configcustommenuitems', 'admin'), '', PARAM_RAW, '50', '10'));
$temp->add(new admin_setting_configtextarea(
+1 -5
View File
@@ -59,12 +59,8 @@ if (($hassiteconfig || has_any_capability(array(
$backpacks = badges_get_site_backpacks();
$choices = array();
$defaultchoice = 0;
foreach ($backpacks as $backpack) {
$choices[$backpack->id] = $backpack->backpackweburl;
if ($backpack->backpackweburl == BADGRIO_BACKPACKWEBURL) {
$defaultchoice = $backpack->id;
}
}
$globalsettings->add(new admin_setting_configcheckbox('badges_allowcoursebadges',
@@ -107,7 +103,7 @@ if (($hassiteconfig || has_any_capability(array(
$backpacksettings->add(new admin_setting_configselect('badges_site_backpack',
new lang_string('sitebackpack', 'badges'),
new lang_string('sitebackpack_help', 'badges'),
$defaultchoice, $choices));
1, $choices));
$ADMIN->add('badges', $backpacksettings);
-46
View File
@@ -181,30 +181,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
}
// Add a category for the Activity Chooser.
$ADMIN->add('courses', new admin_category('activitychooser', new lang_string('activitychoosercategory', 'course')));
$temp = new admin_settingpage('activitychoosersettings', new lang_string('activitychoosersettings', 'course'));
$temp->add(
new admin_setting_configselect(
'activitychoosertabmode',
new lang_string('activitychoosertabmode', 'course'),
new lang_string('activitychoosertabmode_desc', 'course'),
0,
[
0 => new lang_string('activitychoosertabmodeone', 'course'),
1 => new lang_string('activitychoosertabmodetwo', 'course'),
2 => new lang_string('activitychoosertabmodethree', 'course'),
]
)
);
$ADMIN->add('activitychooser', $temp);
$ADMIN->add('activitychooser',
new admin_externalpage('activitychooserrecommended', new lang_string('activitychooserrecommendations', 'course'),
new moodle_url('/course/recommendations.php'),
array('moodle/course:recommendactivity')
)
);
// Add a category for backups.
$ADMIN->add('courses', new admin_category('backups', new lang_string('backups','admin')));
@@ -253,11 +229,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
array('value' => 1, 'locked' => 0)));
$temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
$temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_contentbankcontent',
new lang_string('generalcontentbankcontent', 'backup'),
new lang_string('configgeneralcontentbankcontent', 'backup'),
['value' => 1, 'locked' => 0])
);
$ADMIN->add('backups', $temp);
@@ -279,12 +250,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
array('value' => 1, 'locked' => 0)));
$temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
$temp->add(new admin_setting_configcheckbox_with_lock(
'backup/backup_import_contentbankcontent',
new lang_string('generalcontentbankcontent', 'backup'),
new lang_string('configgeneralcontentbankcontent', 'backup'),
['value' => 1, 'locked' => 0])
);
$ADMIN->add('backups', $temp);
@@ -311,8 +276,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$maxkeptoptions = array(
0 => new lang_string('all'), 1 => '1',
2 => '2',
3 => '3',
4 => '4',
5 => '5',
10 => '10',
20 => '20',
@@ -404,12 +367,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'),
new lang_string('configgeneralgroups', 'backup'), 1));
$temp->add(new admin_setting_configcheckbox('backup/backup_auto_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), 1));
$temp->add(new admin_setting_configcheckbox(
'backup/backup_auto_contentbankcontent',
new lang_string('generalcontentbankcontent', 'backup'),
new lang_string('configgeneralcontentbankcontent', 'backup'),
1)
);
//$temp->add(new admin_setting_configcheckbox('backup/backup_auto_messages', new lang_string('messages', 'message'), new lang_string('backupmessageshelp','message'), 0));
//$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));
@@ -470,9 +427,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
new lang_string('generalcompetencies', 'backup'),
new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
$temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
new lang_string('generalcontentbankcontent', 'backup'),
new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));
// Restore defaults when merging into another course.
$temp->add(new admin_setting_heading('mergerestoredefaults', new lang_string('mergerestoredefaults', 'backup'), ''));
+1
View File
@@ -10,6 +10,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$temp = new admin_settingpage('experimentalsettings', new lang_string('experimentalsettings', 'admin'));
//TODO: Re-enable cc-import once re-implemented in 2.0.x
//$temp->add(new admin_setting_configcheckbox('enableimsccimport', new lang_string('enable_cc_import', 'imscc'), new lang_string('enable_cc_import_description', 'imscc'), 0));
$temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
+2 -17
View File
@@ -24,21 +24,6 @@
defined('MOODLE_INTERNAL') || die();
// H5P overview.
$ADMIN->add('h5p', new admin_externalpage('h5poverview', get_string('h5poverview', 'core_h5p'),
new moodle_url('/h5p/overview.php'), ['moodle/site:config']));
// Manage H5P libraries page.
$ADMIN->add('h5p', new admin_externalpage('h5pmanagelibraries', get_string('h5pmanage', 'core_h5p'),
// Settings page.
$ADMIN->add('h5p', new admin_externalpage('h5psettings', get_string('h5pmanage', 'core_h5p'),
new moodle_url('/h5p/libraries.php'), ['moodle/site:config', 'moodle/h5p:updatelibraries']));
// H5P settings.
$defaulth5plib = \core_h5p\local\library\autoloader::get_default_handler_library();
if (!empty($defaulth5plib)) {
// As for now this page only has this setting, it will be hidden if there isn't any H5P libraries handler defined.
$settings = new admin_settingpage('h5psettings', new lang_string('h5psettings', 'core_h5p'));
$ADMIN->add('h5p', $settings);
$settings->add(new admin_settings_h5plib_handler_select('h5plibraryhandler', new lang_string('h5plibraryhandler', 'core_h5p'),
new lang_string('h5plibraryhandler_help', 'core_h5p'), $defaulth5plib));
}
-45
View File
@@ -1,45 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* This file defines the settings pages for licenses.
*
* @package core
* @copyright 2020 Tom Dickman <tomdickman@catalyst-au.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/licenselib.php');
if ($hassiteconfig) {
$temp = new admin_settingpage('licensesettings', new lang_string('licensesettings', 'admin'));
$licenses = license_manager::get_active_licenses_as_array();
$temp->add(new admin_setting_configselect('sitedefaultlicense',
new lang_string('configsitedefaultlicense', 'admin'),
new lang_string('configsitedefaultlicensehelp', 'admin'),
'unknown',
$licenses));
$temp->add(new admin_setting_configcheckbox('rememberuserlicensepref',
new lang_string('rememberuserlicensepref', 'admin'),
new lang_string('rememberuserlicensepref_help', 'admin'),
1));
$ADMIN->add('license', $temp);
}
+14 -50
View File
@@ -1,57 +1,21 @@
<?php
// This file is part of Moodle - https://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Define administration settings on the Location settings page.
*
* @package core
* @category admin
* @copyright 2006 Martin Dougiamas <martin@moodle.com>
* @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
defined('MOODLE_INTERNAL') || die();
// "locations" settingpage
$temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'admin'));
$temp->add(new admin_setting_servertimezone());
$temp->add(new admin_setting_forcetimezone());
$temp->add(new admin_settings_country_select('country', new lang_string('country', 'admin'), new lang_string('configcountry', 'admin'), 0));
$temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'admin'), new lang_string('defaultcity_help', 'admin'), ''));
if ($hassiteconfig) {
$temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'core_admin'));
$temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'admin'), new lang_string('iplookupinfo', 'admin')));
$temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'admin'),
new lang_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLite2-City.mmdb'));
$temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'admin'), new lang_string('googlemapkey3_help', 'admin'), '', PARAM_RAW, 60));
if ($ADMIN->fulltree) {
$temp->add(new admin_setting_servertimezone());
$temp->add(new admin_setting_forcetimezone());
$temp->add(new admin_settings_country_select('country', new lang_string('country', 'core_admin'),
new lang_string('configcountry', 'core_admin'), 0));
$temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'core_admin'),
new lang_string('defaultcity_help', 'core_admin'), ''));
$temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'core_admin'),
new lang_string('iplookupinfo', 'core_admin')));
$temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'core_admin'),
new lang_string('configgeoipfile', 'core_admin', $CFG->dataroot . '/geoip/'),
$CFG->dataroot . '/geoip/GeoLite2-City.mmdb'));
$temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'),
new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60));
$temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
new lang_string('configallcountrycodes', 'core_admin')));
}
$temp->add(new admin_setting_configtext('allcountrycodes', new lang_string('allcountrycodes', 'admin'), new lang_string('configallcountrycodes', 'admin'), '', '/^(?:\w+(?:,\w+)*)?$/'));
$ADMIN->add('location', $temp);
}
} // end of speedup
+14 -13
View File
@@ -182,6 +182,20 @@ if ($hassiteconfig) {
$plugin->load_settings($ADMIN, 'mlbackendsettings', $hassiteconfig);
}
/// License types
$ADMIN->add('modules', new admin_category('licensesettings', new lang_string('licenses')));
$temp = new admin_settingpage('managelicenses', new lang_string('managelicenses', 'admin'));
require_once($CFG->libdir . '/licenselib.php');
$licenses = array();
$array = explode(',', $CFG->licenses);
foreach ($array as $value) {
$licenses[$value] = new lang_string($value, 'license');
}
$temp->add(new admin_setting_configselect('sitedefaultlicense', new lang_string('configsitedefaultlicense','admin'), new lang_string('configsitedefaultlicensehelp','admin'), 'allrightsreserved', $licenses));
$temp->add(new admin_setting_managelicenses());
$ADMIN->add('licensesettings', $temp);
/// Filter plugins
$ADMIN->add('modules', new admin_category('filtersettings', new lang_string('managefilters')));
@@ -643,19 +657,6 @@ if ($hassiteconfig) {
}
}
// Content bank content types.
if ($hassiteconfig) {
$ADMIN->add('modules', new admin_category('contentbanksettings', new lang_string('contentbank')));
$temp = new admin_settingpage('managecontentbanktypes', new lang_string('managecontentbanktypes'));
$temp->add(new admin_setting_managecontentbankcontenttypes());
$ADMIN->add('contentbanksettings', $temp);
$plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
foreach ($plugins as $plugin) {
/** @var \core\plugininfo\contentbank $plugin */
$plugin->load_settings($ADMIN, 'contentbanksettings', $hassiteconfig);
}
}
/// Add all local plugins - must be always last!
if ($hassiteconfig) {
$ADMIN->add('modules', new admin_category('localplugins', new lang_string('localplugins')));
-3
View File
@@ -100,9 +100,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$temp->add(new admin_setting_configtext('minpasswordupper', new lang_string('minpasswordupper', 'admin'), new lang_string('configminpasswordupper', 'admin'), 1, PARAM_INT));
$temp->add(new admin_setting_configtext('minpasswordnonalphanum', new lang_string('minpasswordnonalphanum', 'admin'), new lang_string('configminpasswordnonalphanum', 'admin'), 1, PARAM_INT));
$temp->add(new admin_setting_configtext('maxconsecutiveidentchars', new lang_string('maxconsecutiveidentchars', 'admin'), new lang_string('configmaxconsecutiveidentchars', 'admin'), 0, PARAM_INT));
$temp->add(new admin_setting_configcheckbox('passwordpolicycheckonlogin',
new lang_string('passwordpolicycheckonlogin', 'admin'),
new lang_string('configpasswordpolicycheckonlogin', 'admin'), 0));
$temp->add(new admin_setting_configtext('passwordreuselimit',
new lang_string('passwordreuselimit', 'admin'),
+10 -5
View File
@@ -44,10 +44,15 @@ $temp = new admin_settingpage('sessionhandling', new lang_string('sessionhandlin
if (empty($CFG->session_handler_class) and $DB->session_lock_supported()) {
$temp->add(new admin_setting_configcheckbox('dbsessions', new lang_string('dbsessions', 'admin'), new lang_string('configdbsessions', 'admin'), 0));
}
$temp->add(new admin_setting_configduration('sessiontimeout', new lang_string('sessiontimeout', 'admin'),
new lang_string('configsessiontimeout', 'admin'), 8 * 60 * 60));
$temp->add(new admin_setting_configselect('sessiontimeout', new lang_string('sessiontimeout', 'admin'), new lang_string('configsessiontimeout', 'admin'), 7200, array(14400 => new lang_string('numhours', '', 4),
10800 => new lang_string('numhours', '', 3),
7200 => new lang_string('numhours', '', 2),
5400 => new lang_string('numhours', '', '1.5'),
3600 => new lang_string('numminutes', '', 60),
2700 => new lang_string('numminutes', '', 45),
1800 => new lang_string('numminutes', '', 30),
900 => new lang_string('numminutes', '', 15),
300 => new lang_string('numminutes', '', 5))));
$temp->add(new admin_setting_configtext('sessioncookie', new lang_string('sessioncookie', 'admin'), new lang_string('configsessioncookie', 'admin'), '', PARAM_ALPHANUM));
$temp->add(new admin_setting_configtext('sessioncookiepath', new lang_string('sessioncookiepath', 'admin'), new lang_string('configsessioncookiepath', 'admin'), '', PARAM_RAW));
$temp->add(new admin_setting_configtext('sessioncookiedomain', new lang_string('sessioncookiedomain', 'admin'), new lang_string('configsessioncookiedomain', 'admin'), '', PARAM_RAW, 50));
@@ -94,7 +99,7 @@ $options = array(
GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
$temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'),
new lang_string('configgetremoteaddrconf', 'admin'),
GETREMOTEADDR_SKIP_DEFAULT, $options));
GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP, $options));
$temp->add(new admin_setting_configtext('reverseproxyignore', new lang_string('reverseproxyignore', 'admin'), new lang_string('configreverseproxyignore', 'admin'), ''));
$temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'), new lang_string('webproxyinfo', 'admin')));
-4
View File
@@ -20,9 +20,6 @@ $moodleservices = new admin_settingpage('moodleservices', new lang_string('moodl
'admin'));
$ADMIN->add('root', $moodleservices);
$userfeedback = new admin_settingpage('userfeedback', new lang_string('feedbacksettings', 'admin'));
$ADMIN->add('root', $userfeedback);
if ($hassiteconfig) {
$optionalsubsystems = new admin_settingpage('optionalsubsystems', new lang_string('advancedfeatures', 'admin'));
$ADMIN->add('root', $optionalsubsystems);
@@ -35,7 +32,6 @@ $ADMIN->add('root', new admin_category('analytics', new lang_string('analytics',
$ADMIN->add('root', new admin_category('competencies', new lang_string('competencies', 'core_competency')));
$ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));
$ADMIN->add('root', new admin_category('h5p', new lang_string('h5p', 'core_h5p')));
$ADMIN->add('root', new admin_category('license', new lang_string('license')));
$ADMIN->add('root', new admin_category('location', new lang_string('location','admin')));
$ADMIN->add('root', new admin_category('language', new lang_string('language')));
$ADMIN->add('root', new admin_category('messaging', new lang_string('messagingcategory', 'admin')));
-49
View File
@@ -1,49 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* This file contains call to feedback settings
*
* @package core
* @copyright 2020 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
if ($hassiteconfig) {
$userfeedback->add(new admin_setting_configcheckbox('enableuserfeedback',
new lang_string('enableuserfeedback', 'admin'),
new lang_string('enableuserfeedback_desc', 'admin'), 0, 1, 0));
$options = [
core_userfeedback::REMIND_AFTER_UPGRADE => new lang_string('userfeedbackafterupgrade', 'admin'),
core_userfeedback::REMIND_PERIODICALLY => new lang_string('userfeedbackperiodically', 'admin'),
core_userfeedback::REMIND_NEVER => new lang_string('never'),
];
$userfeedback->add(new admin_setting_configselect('userfeedback_nextreminder',
new lang_string('userfeedbacknextreminder', 'admin'),
new lang_string('userfeedbacknextreminder_desc', 'admin'), 1, $options));
$userfeedback->hide_if('userfeedback_nextreminder', 'enableuserfeedback');
$userfeedback->add(new admin_setting_configtext('userfeedback_remindafter',
new lang_string('userfeedbackremindafter', 'admin'),
new lang_string('userfeedbackremindafter_desc', 'admin'), 90, PARAM_INT));
$userfeedback->hide_if('userfeedback_remindafter', 'enableuserfeedback');
$userfeedback->hide_if('userfeedback_remindafter', 'userfeedback_nextreminder', 'eq', 3);
}
-1
View File
@@ -186,7 +186,6 @@ if ($hassiteconfig
'email' => new lang_string('email'),
'city' => new lang_string('city'),
'country' => new lang_string('country'),
'moodlenetprofile' => new lang_string('moodlenetprofile', 'user'),
'timezone' => new lang_string('timezone'),
'webpage' => new lang_string('webpage'),
'icqnumber' => new lang_string('icqnumber'),
-4
View File
@@ -32,7 +32,6 @@ $result = optional_param('result', null, PARAM_INT);
$pageurl = new \moodle_url('/admin/tasklogs.php');
$pageurl->param('filter', $filter);
$pageurl->param('result', $result);
$PAGE->set_url($pageurl);
$PAGE->set_context(context_system::instance());
@@ -63,8 +62,6 @@ if (null !== $logid) {
$renderer = $PAGE->get_renderer('tool_task');
echo $OUTPUT->header();
// Output the search form.
echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
'action' => $pageurl->out(),
'filter' => htmlentities($filter),
@@ -87,7 +84,6 @@ echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
],
]);
// Output any matching logs.
$table = new \core_admin\task_log_table($filter, $result);
$table->baseurl = $pageurl;
$table->out(100, false);
+4 -4
View File
@@ -53,10 +53,10 @@
<p {{#labelfor}}id="{{labelfor}}_label"{{/labelfor}}>
{{{title}}}
{{#override}}
<div class="alert alert-info">{{override}}</div>
<div class="form-overridden">{{override}}</div>
{{/override}}
{{#warning}}
<div class="alert alert-warning">{{warning}}</div>
<div class="form-warning">{{warning}}</div>
{{/warning}}
</p>
{{/customcontrol}}
@@ -64,10 +64,10 @@
<label {{#labelfor}}for="{{labelfor}}"{{/labelfor}}>
{{{title}}}
{{#override}}
<div class="alert alert-info">{{override}}</div>
<div class="form-overridden">{{override}}</div>
{{/override}}
{{#warning}}
<div class="alert alert-warning">{{warning}}</div>
<div class="form-warning">{{warning}}</div>
{{/warning}}
</label>
{{/customcontrol}}
@@ -25,7 +25,6 @@
* value - yes value
* id - element id
* checked - boole
* readonly - bool
Example context (json):
{
@@ -33,11 +32,10 @@
"no": "False",
"value": "True",
"id": "test0",
"checked": "checked",
"readonly": false
"checked": "checked"
}
}}
<div class="form-checkbox defaultsnext">
<input type="hidden" name="{{name}}" value="{{no}}">
<input {{#readonly}}disabled{{/readonly}} type="checkbox" name="{{name}}" value="{{value}}" id="{{id}}" {{#checked}}checked{{/checked}}>
<input type="checkbox" name="{{name}}" value="{{value}}" id="{{id}}" {{#checked}}checked{{/checked}}>
</div>
@@ -25,7 +25,6 @@
* id - element id
* value - element value
* haspreviewconfig - show preview of selected color
* readonly - bool
Example context (json):
{
@@ -33,7 +32,6 @@
"name": "name0",
"id": "id0",
"value": "#555655",
"readonly": false,
"haspreviewconfig": false
}
}}
@@ -46,7 +44,7 @@
{{>core/pix_icon}}
{{/icon}}
</div>
<input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
<input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr">
{{#haspreviewconfig}}
<input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
{{/haspreviewconfig}}
@@ -33,7 +33,7 @@
"name": "test",
"value": "/my-super-secret-path/",
"id": "test0",
"readonly": false,
"readonly": true,
"showvalidity": true,
"valid": false
}
@@ -23,7 +23,6 @@
* name - form element name
* options - list of options for units containing name, value, selected
* value - yes
* readonly - bool
* id - element id
Example context (json):
@@ -31,7 +30,6 @@
"name": "test",
"value": "5",
"id": "test0",
"readonly": false,
"options": [ { "name": "Minutes", "value": "mins", "selected": true } ]
}
}}
@@ -40,9 +38,9 @@
}}
<div class="form-duration defaultsnext">
<div class="form-inline">
<input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
<input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
<label class="sr-only" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
<select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select" {{#readonly}}disabled{{/readonly}}>
<select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select">
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
@@ -33,7 +33,7 @@
"name": "test",
"value": "/usr/bin/cowsay",
"id": "test0",
"readonly": false,
"readonly": true,
"showvalidity": true,
"valid": false
}
+1 -3
View File
@@ -26,7 +26,6 @@
* readonly - Make the field readonly
* value - value
* showvalidity - Show a green check if the path is readable
* readonly - bool
* valid - True if the path is readable
Example context (json):
@@ -34,9 +33,8 @@
"name": "test",
"value": "/my-super-secret-path/file",
"id": "test0",
"readonly": false,
"readonly": true,
"showvalidity": true,
"readonly": false,
"valid": false
}
}}
@@ -24,14 +24,12 @@
* options - list of options for units containing name, value, selected
* value - yes
* id - element id
* readonly - bool
Example context (json):
{
"name": "test",
"value": "5",
"id": "test0",
"readonly": false,
"options": [ { "name": "KB", "value": "1024", "selected": true } ]
}
}}
@@ -40,9 +38,9 @@
}}
<div class="form-filesize defaultsnext">
<div class="form-inline">
<input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
<input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
<label class="sr-only" for="{{id}}u">{{#str}}filesizeunits, admin{{/str}}</label>
<select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select" {{#readonly}}disabled{{/readonly}}>
<select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select">
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
@@ -24,13 +24,11 @@
* id - element id
* size - element size
* options - list of options containing name, value, selected
* readonly - bool
Example context (json):
{
"name": "test",
"id": "test0",
"readonly": false,
"size": "3",
"options": [ { "name": "Option 1", "value": "V", "selected": true },
{ "name": "Option 2", "value": "V", "selected": true } ]
@@ -41,7 +39,7 @@
}}
<div class="form-select">
<input type="hidden" name="{{name}}[xxxxx]" value="1">
<select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
<select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
@@ -25,13 +25,11 @@
* size - element size
* options - list of options not grouped
* optgroups - list of options grouped containing the group label and for each option: name, value, selected
* readonly - bool
Example context (json):
{
"name": "test",
"id": "test0",
"readonly": false,
"size": "3",
"options": [
{ "name": "Option 1", "value": "V", "selected": false },
@@ -60,7 +58,7 @@
}}
<div class="form-select">
<input type="hidden" name="{{name}}[xxxxx]" value="1">
<select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
<select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
@@ -24,30 +24,15 @@
* size - form element size
* value - form element value
* id - element id
* readonly - has value been defined in config.php
Example context (json):
{
"name": "test",
"id": "test0",
"size": "8",
"value": "secret",
"readonly": false
"value": "secret"
}
}}
{{#readonly}}
<div class="form-password">
<input type="text"
name = "{{ name }}"
id="{{ id }}"
value="********"
size="{{ size }}"
class="form-control"
disabled
>
</div>
{{/readonly}}
{{^readonly}}
<div class="form-password">
<span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
<span data-passwordunmask="editor">
@@ -76,4 +61,3 @@ require(['core_form/passwordunmask'], function(PasswordUnmask) {
new PasswordUnmask("{{ id }}");
});
{{/js}}
{{/readonly}}
@@ -23,13 +23,11 @@
* name - form element name
* id - element id
* options - list of options containing name, value, selected
* readonly - bool
Example context (json):
{
"name": "test",
"id": "test0",
"readonly": false,
"options": [
{ "name": "Option 1", "value": "V", "selected": true },
{ "name": "Option 2", "value": "V", "selected": true }
@@ -40,7 +38,7 @@
Setting configselect.
}}
<div class="form-select defaultsnext">
<select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}" class="custom-select">
<select id="{{id}}" name="{{name}}" class="custom-select">
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
@@ -22,7 +22,6 @@
Context variables required for this template:
* name - form element name
* id - element id
* readonly - bool
* options - list of options (not grouped)
* optgroups - list of options grouped containing the group label and for each option: name, value, selected
@@ -30,7 +29,6 @@
{
"name": "test",
"id": "test0",
"readonly": false,
"options": [
{ "name": "Option 1", "value": "V", "selected": false },
{ "name": "Option 2", "value": "V", "selected": false }
@@ -57,7 +55,7 @@
Setting configselect with optgroup support.
}}
<div class="form-select defaultsnext">
<select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}" class="custom-select">
<select id="{{id}}" name="{{name}}" class="custom-select">
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
+1 -3
View File
@@ -26,7 +26,6 @@
* size - element size
* forceltr - always display as ltr
* attributes - list of additional attributes containing name, value
* readonly - bool
Example context (json):
{
@@ -35,7 +34,6 @@
"value": "A tall, dark stranger will have more fun than you.",
"size": "21",
"forceltr": false,
"readonly": false,
"attributes": [ { "name": "readonly", "value": "readonly" } ]
}
}}
@@ -43,5 +41,5 @@
Setting configtext.
}}
<div class="form-text defaultsnext">
<input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="form-control {{#forceltr}}text-ltr{{/forceltr}}" {{#readonly}}disabled{{/readonly}}>
<input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">
</div>
@@ -33,7 +33,6 @@
"cols": "30",
"rows": "3",
"value": "Excellent day for putting Slinkies on an escalator.",
"readonly": false,
"id": "test0"
}
}}
@@ -41,5 +40,5 @@
Setting configtextarea.
}}
<div class="form-textarea">
<textarea {{#readonly}}disabled{{/readonly}} rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
<textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
</div>
+2 -4
View File
@@ -24,13 +24,11 @@
* id - element id
* hours - list of valid hour options containing name, value, selected
* minutes - list of valid minute options containing name, value, selected
* readonly - bool
Example context (json):
{
"name": "test",
"id": "test0",
"readonly": false,
"minutes": [
{ "name": "00", "value": "0", "selected": true },
{ "name": "01", "value": "1", "selected": false }
@@ -47,13 +45,13 @@
<div class="form-time defaultsnext">
<div class="form-inline text-ltr">
<label class="sr-only" for="{{id}}h">{{#str}}hours{{/str}}</label>
<select id="{{id}}h" name="{{name}}[h]" class="custom-select" {{#readonly}}disabled{{/readonly}}>
<select id="{{id}}h" name="{{name}}[h]" class="custom-select">
{{#hours}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/hours}}
</select>:
<label class="sr-only" for="{{id}}m">{{#str}}minutes{{/str}}</label>
<select id="{{id}}m" name="{{name}}[m]" class="custom-select" {{#readonly}}disabled{{/readonly}}>
<select id="{{id}}m" name="{{name}}[m]" class="custom-select">
{{#minutes}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/minutes}}
@@ -47,7 +47,7 @@
<h3 class="adminpagetitle"><a href="{{url}}">{{{title}}}</a></h3>
<ul class="adminpagepath" aria-label="{{#str}} pagepath, core {{/str}}">
{{#path}}
<li class="small text-muted">{{.}}</li>
<li>{{.}}</li>
{{/path}}
</ul>
<fieldset class="adminsettings">
+1 -1
View File
@@ -17,7 +17,7 @@
{{!
@template core_admin/tasklogs
This is the template for the search form which appears above the task logs report.
Task Logs template.
}}
<form class="form-inline" method="GET" action="{{{action}}}">
<label class="sr-only" for="tasklog-filter">{{#str}}filter{{/str}}</label>
+5 -2
View File
@@ -53,8 +53,11 @@ class behat_admin extends behat_base {
}
foreach ($data as $label => $value) {
// Navigate straight to the search results fo rthis label.
$this->execute('behat_general::i_visit', ["/admin/search.php?query=" . urlencode($label)]);
$this->execute('behat_navigation::i_select_from_flat_navigation_drawer', [get_string('administrationsite')]);
// Search by label.
$this->execute('behat_forms::i_set_the_field_to', [get_string('query', 'admin'), $label]);
$this->execute("behat_forms::press_button", get_string('search', 'admin'));
// Admin settings does not use the same DOM structure than other moodle forms
// but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
+7 -21
View File
@@ -6,18 +6,14 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
Background:
Given the following "users" exist:
| username | firstname | lastname | email | auth | confirmed | lastip | institution | department |
| user1 | User | One | one@example.com | manual | 0 | 127.0.1.1 | moodle | red |
| user2 | User | Two | two@example.com | ldap | 1 | 0.0.0.0 | moodle | blue |
| user3 | User | Three | three@example.com | manual | 1 | 0.0.0.0 | | |
| user4 | User | Four | four@example.com | ldap | 0 | 127.0.1.2 | | |
| username | firstname | lastname | email | auth | confirmed | lastip |
| user1 | User | One | one@example.com | manual | 0 | 127.0.1.1 |
| user2 | User | Two | two@example.com | ldap | 1 | 0.0.0.0 |
| user3 | User | Three | three@example.com | manual | 1 | 0.0.0.0 |
| user4 | User | Four | four@example.com | ldap | 0 | 127.0.1.2 |
And the following "cohorts" exist:
| name | idnumber |
| Cohort 1 | CH1 |
And the following "cohort members" exist:
| user | cohort |
| user2 | CH1 |
| user3 | CH1 |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
@@ -27,6 +23,8 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
| user2 | C1 | student |
| user3 | C1 | student |
And I log in as "admin"
And I add "User Two (two@example.com)" user to "CH1" cohort members
And I add "User Three (three@example.com)" user to "CH1" cohort members
And I navigate to "Users > Accounts > Browse list of users" in site administration
Scenario: Filter user accounts by role and cohort
@@ -106,15 +104,3 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
And I should see "User Two"
And I should see "User Three"
And I should see "User Four"
Scenario: Filter users by institution and department
When I set the field "id_institution" to "moodle"
And I press "Add filter"
Then I should see "User One"
And I should see "User Two"
And I should not see "User Three"
And I should not see "User Four"
And I set the field "id_department" to "red"
And I press "Add filter"
And I should see "User One"
And I should not see "User Two"
@@ -1,29 +0,0 @@
@core @core_admin
Feature: Administrator is warned and when trying to set invalid allcountrycodes value.
In order to avoid misconfiguration of the country selector fields
As an admin
I want to be warned when I try to set an invalid country code in the allcountrycodes field
Scenario: Attempting to set allcountrycodes field with valid country codes
Given I log in as "admin"
And I navigate to "Location > Location settings" in site administration
When I set the following administration settings values:
| All country codes | CZ,BE,GB,ES |
Then I should not see "Invalid country code"
Scenario: Attempting to set allcountrycodes field with invalid country code
Given I log in as "admin"
And I navigate to "Location > Location settings" in site administration
When I set the following administration settings values:
| All country codes | CZ,BE,FOOBAR,GB,ES |
Then I should see "Invalid country code: FOOBAR"
Scenario: Attempting to unset allcountrycodes field
Given I log in as "admin"
And I navigate to "Location > Location settings" in site administration
And I set the following administration settings values:
| All country codes | CZ,BE,GB,ES |
And I navigate to "Location > Location settings" in site administration
When I set the following administration settings values:
| All country codes | |
Then I should not see "Invalid country code"
@@ -1,34 +0,0 @@
@core @core_admin
Feature: Configure language settings for the site
In order to configure language settings for the site
As an admin
I want to set language settings relevant to my site users
Scenario: Set languages on language menu
Given I log in as "admin"
And I navigate to "Language > Language settings" in site administration
When I set the field "Languages on language menu" to "en"
And I press "Save changes"
Then I should not see "Invalid language code"
Scenario: Reset languages on language menu
Given I log in as "admin"
And I navigate to "Language > Language settings" in site administration
When I set the field "Languages on language menu" to ""
And I press "Save changes"
Then I should not see "Invalid language code"
Scenario Outline: Set languages on language menu with invalid language
Given I log in as "admin"
And I navigate to "Language > Language settings" in site administration
When I set the field "Languages on language menu" to "<fieldvalue>"
And I press "Save changes"
Then I should see "Invalid language code: <invalidlang>"
Examples:
| fieldvalue | invalidlang |
| xx | xx |
| xx\|Bad | xx |
| en,qq | qq |
| en,qq\|Bad | qq |
| en$$ | en$$ |
| en$$\|Bad | en$$ |
+2 -12
View File
@@ -1,12 +1,2 @@
/**
* Shows a dialogue with info about this logs.
*
* @module tool_analytics/log_info
* @class log_info
* @package tool_analytics
* @copyright 2017 David Monllao {@link http://www.davidmonllao.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define("tool_analytics/log_info",["jquery","core/str","core/modal_factory","core/notification"],(function($,str,ModalFactory,Notification){return{loadInfo:function(id,info){var link=$('[data-model-log-id="'+id+'"]');str.get_string("loginfo","tool_analytics").then((function(langString){var bodyInfo=$("<ul>");return info.forEach((function(item){bodyInfo.append("<li>"+item+"</li>")})),bodyInfo.append("</ul>"),ModalFactory.create({title:langString,body:bodyInfo.html(),large:!0},link)})).catch(Notification.exception)}}}));
//# sourceMappingURL=log_info.min.js.map
define ("tool_analytics/log_info",["jquery","core/str","core/modal_factory","core/notification"],function(a,b,c,d){return{loadInfo:function loadInfo(e,f){var g=a("[data-model-log-id=\""+e+"\"]");b.get_string("loginfo","tool_analytics").then(function(b){var d=a("<ul>");f.forEach(function(a){d.append("<li>"+a+"</li>")});d.append("</ul>");return c.create({title:b,body:d.html(),large:!0},g)}).catch(d.exception)}}});
//# sourceMappingURL=log_info.min.js.map
@@ -1 +1 @@
{"version":3,"file":"log_info.min.js","sources":["../src/log_info.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Shows a dialogue with info about this logs.\n *\n * @module tool_analytics/log_info\n * @class log_info\n * @package tool_analytics\n * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/str', 'core/modal_factory', 'core/notification'], function($, str, ModalFactory, Notification) {\n\n return /** @alias module:tool_analytics/log_info */ {\n\n /**\n * Prepares a modal info for a log's results.\n *\n * @method loadInfo\n * @param {int} id\n * @param {string[]} info\n */\n loadInfo: function(id, info) {\n\n var link = $('[data-model-log-id=\"' + id + '\"]');\n str.get_string('loginfo', 'tool_analytics').then(function(langString) {\n\n var bodyInfo = $(\"<ul>\");\n info.forEach(function(item) {\n bodyInfo.append('<li>' + item + '</li>');\n });\n bodyInfo.append(\"</ul>\");\n\n return ModalFactory.create({\n title: langString,\n body: bodyInfo.html(),\n large: true,\n }, link);\n\n }).catch(Notification.exception);\n }\n };\n});\n"],"names":["define","$","str","ModalFactory","Notification","loadInfo","id","info","link","get_string","then","langString","bodyInfo","forEach","item","append","create","title","body","html","large","catch","exception"],"mappings":";;;;;;;;;AAwBAA,iCAAO,CAAC,SAAU,WAAY,qBAAsB,sBAAsB,SAASC,EAAGC,IAAKC,aAAcC,oBAEjD,CAShDC,SAAU,SAASC,GAAIC,UAEfC,KAAOP,EAAE,uBAAyBK,GAAK,MAC3CJ,IAAIO,WAAW,UAAW,kBAAkBC,MAAK,SAASC,gBAElDC,SAAWX,EAAE,eACjBM,KAAKM,SAAQ,SAASC,MAClBF,SAASG,OAAO,OAASD,KAAO,YAEpCF,SAASG,OAAO,SAETZ,aAAaa,OAAO,CACvBC,MAAON,WACPO,KAAMN,SAASO,OACfC,OAAO,GACRZ,SAEJa,MAAMjB,aAAakB"}
{"version":3,"sources":["../src/log_info.js"],"names":["define","$","str","ModalFactory","Notification","loadInfo","id","info","link","get_string","then","langString","bodyInfo","forEach","item","append","create","title","body","html","large","catch","exception"],"mappings":"AAwBAA,OAAM,2BAAC,CAAC,QAAD,CAAW,UAAX,CAAuB,oBAAvB,CAA6C,mBAA7C,CAAD,CAAoE,SAASC,CAAT,CAAYC,CAAZ,CAAiBC,CAAjB,CAA+BC,CAA/B,CAA6C,CAEnH,MAAoD,CAShDC,QAAQ,CAAE,kBAASC,CAAT,CAAaC,CAAb,CAAmB,CAEzB,GAAIC,CAAAA,CAAI,CAAGP,CAAC,CAAC,wBAAyBK,CAAzB,CAA8B,KAA/B,CAAZ,CACAJ,CAAG,CAACO,UAAJ,CAAe,SAAf,CAA0B,gBAA1B,EAA4CC,IAA5C,CAAiD,SAASC,CAAT,CAAqB,CAElE,GAAIC,CAAAA,CAAQ,CAAGX,CAAC,CAAC,MAAD,CAAhB,CACAM,CAAI,CAACM,OAAL,CAAa,SAASC,CAAT,CAAe,CACxBF,CAAQ,CAACG,MAAT,CAAgB,OAASD,CAAT,CAAgB,OAAhC,CACH,CAFD,EAGAF,CAAQ,CAACG,MAAT,CAAgB,OAAhB,EAEA,MAAOZ,CAAAA,CAAY,CAACa,MAAb,CAAoB,CACvBC,KAAK,CAAEN,CADgB,CAEvBO,IAAI,CAAEN,CAAQ,CAACO,IAAT,EAFiB,CAGvBC,KAAK,GAHkB,CAApB,CAIJZ,CAJI,CAMV,CAdD,EAcGa,KAdH,CAcSjB,CAAY,CAACkB,SAdtB,CAeH,CA3B+C,CA6BvD,CA/BK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Shows a dialogue with info about this logs.\n *\n * @module tool_analytics/log_info\n * @class log_info\n * @package tool_analytics\n * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/str', 'core/modal_factory', 'core/notification'], function($, str, ModalFactory, Notification) {\n\n return /** @alias module:tool_analytics/log_info */ {\n\n /**\n * Prepares a modal info for a log's results.\n *\n * @method loadInfo\n * @param {int} id\n * @param {string[]} info\n */\n loadInfo: function(id, info) {\n\n var link = $('[data-model-log-id=\"' + id + '\"]');\n str.get_string('loginfo', 'tool_analytics').then(function(langString) {\n\n var bodyInfo = $(\"<ul>\");\n info.forEach(function(item) {\n bodyInfo.append('<li>' + item + '</li>');\n });\n bodyInfo.append(\"</ul>\");\n\n return ModalFactory.create({\n title: langString,\n body: bodyInfo.html(),\n large: true,\n }, link);\n\n }).catch(Notification.exception);\n }\n };\n});\n"],"file":"log_info.min.js"}
+2 -10
View File
@@ -1,10 +1,2 @@
/**
* AMD module for model actions confirmation.
*
* @module tool_analytics/model
* @copyright 2017 David Monllao
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define("tool_analytics/model",["jquery","core/str","core/log","core/notification","core/modal_factory","core/modal_events","core/templates"],(function($,Str,log,Notification,ModalFactory,ModalEvents,Templates){var actionsList={clear:{title:{key:"clearpredictions",component:"tool_analytics"},body:{key:"clearmodelpredictions",component:"tool_analytics"}},delete:{title:{key:"delete",component:"tool_analytics"},body:{key:"deletemodelconfirmation",component:"tool_analytics"}}};return{confirmAction:function(actionId,actionType){$('[data-action-id="'+actionId+'"]').on("click",(function(ev){ev.preventDefault();var a=$(ev.currentTarget);if(void 0!==actionsList[actionType]){var wrap,reqStrings=[actionsList[actionType].title,actionsList[actionType].body];reqStrings[1].param=(wrap=$(a).closest("[data-model-name]")).length?wrap.attr("data-model-name"):(log.error("Unexpected DOM error - unable to obtain the model name"),"");var stringsPromise=Str.get_strings(reqStrings),modalPromise=ModalFactory.create({type:ModalFactory.types.SAVE_CANCEL});$.when(stringsPromise,modalPromise).then((function(strings,modal){return modal.setTitle(strings[0]),modal.setBody(strings[1]),modal.setSaveButtonText(strings[0]),modal.getRoot().on(ModalEvents.save,(function(){window.location.href=a.attr("href")})),modal.show(),modal})).fail(Notification.exception)}else log.error('Action "'+actionType+'" is not allowed.')}))},selectEvaluationOptions:function(actionId,trainedOnlyExternally){$('[data-action-id="'+actionId+'"]').on("click",(function(ev){ev.preventDefault();var a=$(ev.currentTarget),timeSplittingMethods=$(this).attr("data-timesplitting-methods"),stringsPromise=Str.get_strings([{key:"evaluatemodel",component:"tool_analytics"},{key:"evaluate",component:"tool_analytics"}]),modalPromise=ModalFactory.create({type:ModalFactory.types.SAVE_CANCEL}),bodyPromise=Templates.render("tool_analytics/evaluation_options",{trainedexternally:trainedOnlyExternally,timesplittingmethods:JSON.parse(timeSplittingMethods)});$.when(stringsPromise,modalPromise).then((function(strings,modal){return modal.getRoot().on(ModalEvents.hidden,modal.destroy.bind(modal)),modal.setTitle(strings[0]),modal.setSaveButtonText(strings[1]),modal.setBody(bodyPromise),modal.getRoot().on(ModalEvents.save,(function(){"trainedmodel"==$("input[name='evaluationmode']:checked").val()&&a.attr("href",a.attr("href")+"&mode=trainedmodel");var timeSplittingMethod=$("#id-evaluation-timesplitting").val();a.attr("href",a.attr("href")+"&timesplitting="+timeSplittingMethod),window.location.href=a.attr("href")})),modal.show(),modal})).fail(Notification.exception)}))},selectExportOptions:function(actionId,isTrained){$('[data-action-id="'+actionId+'"]').on("click",(function(ev){ev.preventDefault();var a=$(ev.currentTarget);if(!isTrained)return a.attr("href",a.attr("href")+"&action=exportmodel&includeweights=0"),void(window.location.href=a.attr("href"));var stringsPromise=Str.get_strings([{key:"export",component:"tool_analytics"}]),modalPromise=ModalFactory.create({type:ModalFactory.types.SAVE_CANCEL}),bodyPromise=Templates.render("tool_analytics/export_options",{});$.when(stringsPromise,modalPromise).then((function(strings,modal){return modal.getRoot().on(ModalEvents.hidden,modal.destroy.bind(modal)),modal.setTitle(strings[0]),modal.setSaveButtonText(strings[0]),modal.setBody(bodyPromise),modal.getRoot().on(ModalEvents.save,(function(){"exportdata"==$("input[name='exportoption']:checked").val()?a.attr("href",a.attr("href")+"&action=exportdata"):(a.attr("href",a.attr("href")+"&action=exportmodel"),$("#id-includeweights").is(":checked")?a.attr("href",a.attr("href")+"&includeweights=1"):a.attr("href",a.attr("href")+"&includeweights=0")),window.location.href=a.attr("href")})),modal.show(),modal})).fail(Notification.exception)}))}}}));
//# sourceMappingURL=model.min.js.map
define ("tool_analytics/model",["jquery","core/str","core/log","core/notification","core/modal_factory","core/modal_events","core/templates"],function(b,c,d,e,f,g,h){var i={clear:{title:{key:"clearpredictions",component:"tool_analytics"},body:{key:"clearmodelpredictions",component:"tool_analytics"}},delete:{title:{key:"delete",component:"tool_analytics"},body:{key:"deletemodelconfirmation",component:"tool_analytics"}}},j=function(a){var c=b(a).closest("[data-model-name]");if(c.length){return c.attr("data-model-name")}else{d.error("Unexpected DOM error - unable to obtain the model name");return""}};return{confirmAction:function confirmAction(a,h){b("[data-action-id=\""+a+"\"]").on("click",function(k){k.preventDefault();var l=b(k.currentTarget);if("undefined"==typeof i[h]){d.error("Action \""+h+"\" is not allowed.");return}var a=[i[h].title,i[h].body];a[1].param=j(l);var m=c.get_strings(a),n=f.create({type:f.types.SAVE_CANCEL});b.when(m,n).then(function(a,b){b.setTitle(a[0]);b.setBody(a[1]);b.setSaveButtonText(a[0]);b.getRoot().on(g.save,function(){window.location.href=l.attr("href")});b.show();return b}).fail(e.exception)})},selectEvaluationOptions:function selectEvaluationOptions(a,d){b("[data-action-id=\""+a+"\"]").on("click",function(i){i.preventDefault();var j=b(i.currentTarget),a=b(this).attr("data-timesplitting-methods"),k=c.get_strings([{key:"evaluatemodel",component:"tool_analytics"},{key:"evaluate",component:"tool_analytics"}]),l=f.create({type:f.types.SAVE_CANCEL}),m=h.render("tool_analytics/evaluation_options",{trainedexternally:d,timesplittingmethods:JSON.parse(a)});b.when(k,l).then(function(a,c){c.getRoot().on(g.hidden,c.destroy.bind(c));c.setTitle(a[0]);c.setSaveButtonText(a[1]);c.setBody(m);c.getRoot().on(g.save,function(){var a=b("input[name='evaluationmode']:checked").val();if("trainedmodel"==a){j.attr("href",j.attr("href")+"&mode=trainedmodel")}var c=b("#id-evaluation-timesplitting").val();j.attr("href",j.attr("href")+"&timesplitting="+c);window.location.href=j.attr("href")});c.show();return c}).fail(e.exception)})},selectExportOptions:function selectExportOptions(a,d){b("[data-action-id=\""+a+"\"]").on("click",function(i){i.preventDefault();var j=b(i.currentTarget);if(!d){j.attr("href",j.attr("href")+"&action=exportmodel&includeweights=0");window.location.href=j.attr("href");return}var a=c.get_strings([{key:"export",component:"tool_analytics"}]),k=f.create({type:f.types.SAVE_CANCEL}),l=h.render("tool_analytics/export_options",{});b.when(a,k).then(function(a,c){c.getRoot().on(g.hidden,c.destroy.bind(c));c.setTitle(a[0]);c.setSaveButtonText(a[0]);c.setBody(l);c.getRoot().on(g.save,function(){var a=b("input[name='exportoption']:checked").val();if("exportdata"==a){j.attr("href",j.attr("href")+"&action=exportdata")}else{j.attr("href",j.attr("href")+"&action=exportmodel");if(b("#id-includeweights").is(":checked")){j.attr("href",j.attr("href")+"&includeweights=1")}else{j.attr("href",j.attr("href")+"&includeweights=0")}}window.location.href=j.attr("href")});c.show();return c}).fail(e.exception)})}}});
//# sourceMappingURL=model.min.js.map
File diff suppressed because one or more lines are too long
+2 -12
View File
@@ -1,12 +1,2 @@
/**
* Potential contexts selector module.
*
* @module tool_analytics/potential-contexts
* @class potential-contexts
* @package tool_analytics
* @copyright 2019 David Monllao
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define("tool_analytics/potential-contexts",["jquery","core/ajax"],(function($,Ajax){return{processResults:function(selector,results){var contexts=[];return $.isArray(results)?($.each(results,(function(index,context){contexts.push({value:context.id,label:context.name})})),contexts):results},transport:function(selector,query,success,failure){var modelid=$(selector).attr("modelid")||null;Ajax.call([{methodname:"tool_analytics_potential_contexts",args:{query:query,modelid:modelid}}])[0].then(success).fail(failure)}}}));
//# sourceMappingURL=potential-contexts.min.js.map
define ("tool_analytics/potential-contexts",["jquery","core/ajax"],function(a,b){return{processResults:function processResults(b,c){var d=[];if(a.isArray(c)){a.each(c,function(a,b){d.push({value:b.id,label:b.name})});return d}else{return c}},transport:function transport(c,d,e,f){var g,h=a(c).attr("modelid")||null;g=b.call([{methodname:"tool_analytics_potential_contexts",args:{query:d,modelid:h}}]);g[0].then(e).fail(f)}}});
//# sourceMappingURL=potential-contexts.min.js.map
@@ -1 +1 @@
{"version":3,"file":"potential-contexts.min.js","sources":["../src/potential-contexts.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Potential contexts selector module.\n *\n * @module tool_analytics/potential-contexts\n * @class potential-contexts\n * @package tool_analytics\n * @copyright 2019 David Monllao\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\ndefine(['jquery', 'core/ajax'], function($, Ajax) {\n\n return /** @alias module:tool_analytics/potential-contexts */ {\n\n processResults: function(selector, results) {\n var contexts = [];\n if ($.isArray(results)) {\n $.each(results, function(index, context) {\n contexts.push({\n value: context.id,\n label: context.name\n });\n });\n return contexts;\n\n } else {\n return results;\n }\n },\n\n transport: function(selector, query, success, failure) {\n var promise;\n\n let modelid = $(selector).attr('modelid') || null;\n promise = Ajax.call([{\n methodname: 'tool_analytics_potential_contexts',\n args: {\n query: query,\n modelid: modelid\n }\n }]);\n\n promise[0].then(success).fail(failure);\n }\n\n };\n\n});\n"],"names":["define","$","Ajax","processResults","selector","results","contexts","isArray","each","index","context","push","value","id","label","name","transport","query","success","failure","modelid","attr","call","methodname","args","then","fail"],"mappings":";;;;;;;;;AAyBAA,2CAAO,CAAC,SAAU,cAAc,SAASC,EAAGC,YAEsB,CAE1DC,eAAgB,SAASC,SAAUC,aAC3BC,SAAW,UACXL,EAAEM,QAAQF,UACVJ,EAAEO,KAAKH,SAAS,SAASI,MAAOC,SAC5BJ,SAASK,KAAK,CACVC,MAAOF,QAAQG,GACfC,MAAOJ,QAAQK,UAGhBT,UAGAD,SAIfW,UAAW,SAASZ,SAAUa,MAAOC,QAASC,aAGtCC,QAAUnB,EAAEG,UAAUiB,KAAK,YAAc,KACnCnB,KAAKoB,KAAK,CAAC,CACjBC,WAAY,oCACZC,KAAM,CACFP,MAAOA,MACPG,QAASA,YAIT,GAAGK,KAAKP,SAASQ,KAAKP"}
{"version":3,"sources":["../src/potential-contexts.js"],"names":["define","$","Ajax","processResults","selector","results","contexts","isArray","each","index","context","push","value","id","label","name","transport","query","success","failure","promise","modelid","attr","call","methodname","args","then","fail"],"mappings":"AAyBAA,OAAM,qCAAC,CAAC,QAAD,CAAW,WAAX,CAAD,CAA0B,SAASC,CAAT,CAAYC,CAAZ,CAAkB,CAE9C,MAA8D,CAE1DC,cAAc,CAAE,wBAASC,CAAT,CAAmBC,CAAnB,CAA4B,CACxC,GAAIC,CAAAA,CAAQ,CAAG,EAAf,CACA,GAAIL,CAAC,CAACM,OAAF,CAAUF,CAAV,CAAJ,CAAwB,CACpBJ,CAAC,CAACO,IAAF,CAAOH,CAAP,CAAgB,SAASI,CAAT,CAAgBC,CAAhB,CAAyB,CACrCJ,CAAQ,CAACK,IAAT,CAAc,CACVC,KAAK,CAAEF,CAAO,CAACG,EADL,CAEVC,KAAK,CAAEJ,CAAO,CAACK,IAFL,CAAd,CAIH,CALD,EAMA,MAAOT,CAAAA,CAEV,CATD,IASO,CACH,MAAOD,CAAAA,CACV,CACJ,CAhByD,CAkB1DW,SAAS,CAAE,mBAASZ,CAAT,CAAmBa,CAAnB,CAA0BC,CAA1B,CAAmCC,CAAnC,CAA4C,IAC/CC,CAAAA,CAD+C,CAG/CC,CAAO,CAAGpB,CAAC,CAACG,CAAD,CAAD,CAAYkB,IAAZ,CAAiB,SAAjB,GAA+B,IAHM,CAInDF,CAAO,CAAGlB,CAAI,CAACqB,IAAL,CAAU,CAAC,CACjBC,UAAU,CAAE,mCADK,CAEjBC,IAAI,CAAE,CACFR,KAAK,CAAEA,CADL,CAEFI,OAAO,CAAEA,CAFP,CAFW,CAAD,CAAV,CAAV,CAQAD,CAAO,CAAC,CAAD,CAAP,CAAWM,IAAX,CAAgBR,CAAhB,EAAyBS,IAAzB,CAA8BR,CAA9B,CACH,CA/ByD,CAmCjE,CArCK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Potential contexts selector module.\n *\n * @module tool_analytics/potential-contexts\n * @class potential-contexts\n * @package tool_analytics\n * @copyright 2019 David Monllao\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\ndefine(['jquery', 'core/ajax'], function($, Ajax) {\n\n return /** @alias module:tool_analytics/potential-contexts */ {\n\n processResults: function(selector, results) {\n var contexts = [];\n if ($.isArray(results)) {\n $.each(results, function(index, context) {\n contexts.push({\n value: context.id,\n label: context.name\n });\n });\n return contexts;\n\n } else {\n return results;\n }\n },\n\n transport: function(selector, query, success, failure) {\n var promise;\n\n let modelid = $(selector).attr('modelid') || null;\n promise = Ajax.call([{\n methodname: 'tool_analytics_potential_contexts',\n args: {\n query: query,\n modelid: modelid\n }\n }]);\n\n promise[0].then(success).fail(failure);\n }\n\n };\n\n});\n"],"file":"potential-contexts.min.js"}
@@ -27,7 +27,8 @@ namespace tool_analytics\output;
defined('MOODLE_INTERNAL') || die();
use plugin_renderer_base;
use templatable;
use renderable;
/**
* Renderer class.
@@ -73,12 +74,14 @@ class renderer extends plugin_renderer_base {
* @return string HTML
*/
public function render_evaluate_results($results, $logs = array()) {
global $OUTPUT;
$output = '';
foreach ($results as $timesplittingid => $result) {
if (!CLI_SCRIPT) {
$output .= $this->output->box_start('generalbox mb-3');
$output .= $OUTPUT->box_start('generalbox mb-3');
}
// Check that the array key is a string, not all results depend on time splitting methods (e.g. general errors).
@@ -87,48 +90,47 @@ class renderer extends plugin_renderer_base {
$langstrdata = (object)array('name' => $timesplitting->get_name(), 'id' => $timesplittingid);
if (CLI_SCRIPT) {
$output .= $this->output->heading(get_string('scheduledanalysisresultscli', 'tool_analytics', $langstrdata), 3);
$output .= $OUTPUT->heading(get_string('scheduledanalysisresultscli', 'tool_analytics', $langstrdata), 3);
} else {
$output .= $this->output->heading(get_string('scheduledanalysisresults', 'tool_analytics', $langstrdata), 3);
$output .= $OUTPUT->heading(get_string('scheduledanalysisresults', 'tool_analytics', $langstrdata), 3);
}
}
if ($result->status == 0) {
$output .= $this->output->notification(get_string('goodmodel', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('goodmodel', 'tool_analytics'),
\core\output\notification::NOTIFY_SUCCESS);
} else if ($result->status === \core_analytics\model::NO_DATASET) {
$output .= $this->output->notification(get_string('nodatatoevaluate', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('nodatatoevaluate', 'tool_analytics'),
\core\output\notification::NOTIFY_WARNING);
}
if (isset($result->score)) {
// Score.
$output .= $this->output->heading(get_string('accuracy', 'tool_analytics') . ': ' .
$output .= $OUTPUT->heading(get_string('accuracy', 'tool_analytics') . ': ' .
round(floatval($result->score), 4) * 100 . '%', 4);
}
if (!empty($result->info)) {
foreach ($result->info as $message) {
$output .= $this->output->notification($message, \core\output\notification::NOTIFY_WARNING);
$output .= $OUTPUT->notification($message, \core\output\notification::NOTIFY_WARNING);
}
}
if (!CLI_SCRIPT) {
$output .= $this->output->box_end();
$output .= $OUTPUT->box_end();
}
}
// Info logged during evaluation.
if (!empty($logs) && debugging()) {
$output .= $this->output->heading(get_string('extrainfo', 'tool_analytics'), 3);
$output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 3);
foreach ($logs as $log) {
$output .= $this->output->notification($log, \core\output\notification::NOTIFY_WARNING);
$output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
}
}
if (!CLI_SCRIPT) {
$output .= $this->output->single_button(new \moodle_url('/admin/tool/analytics/index.php'),
get_string('continue'), 'get');
$output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
}
return $output;
@@ -145,68 +147,62 @@ class renderer extends plugin_renderer_base {
* @return string HTML
*/
public function render_get_predictions_results($trainresults = false, $trainlogs = array(), $predictresults = false, $predictlogs = array()) {
global $OUTPUT;
$output = '';
if ($trainresults || (!empty($trainlogs) && debugging())) {
$output .= $this->output->heading(get_string('trainingresults', 'tool_analytics'), 3);
$output .= $OUTPUT->heading(get_string('trainingresults', 'tool_analytics'), 3);
}
if ($trainresults) {
if ($trainresults->status == 0) {
$output .= $this->output->notification(
get_string('trainingprocessfinished', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('trainingprocessfinished', 'tool_analytics'),
\core\output\notification::NOTIFY_SUCCESS);
} else if ($trainresults->status === \core_analytics\model::NO_DATASET ||
$trainresults->status === \core_analytics\model::NOT_ENOUGH_DATA) {
$output .= $this->output->notification(
get_string('nodatatotrain', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('nodatatotrain', 'tool_analytics'),
\core\output\notification::NOTIFY_WARNING);
} else {
$output .= $this->output->notification(
get_string('generalerror', 'tool_analytics', $trainresults->status),
$output .= $OUTPUT->notification(get_string('generalerror', 'tool_analytics', $trainresults->status),
\core\output\notification::NOTIFY_ERROR);
}
}
if (!empty($trainlogs) && debugging()) {
$output .= $this->output->heading(get_string('extrainfo', 'tool_analytics'), 4);
$output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 4);
foreach ($trainlogs as $log) {
$output .= $this->output->notification($log, \core\output\notification::NOTIFY_WARNING);
$output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
}
}
if ($predictresults || (!empty($predictlogs) && debugging())) {
$output .= $this->output->heading(
get_string('predictionresults', 'tool_analytics'), 3, 'main mt-3');
$output .= $OUTPUT->heading(get_string('predictionresults', 'tool_analytics'), 3, 'main mt-3');
}
if ($predictresults) {
if ($predictresults->status == 0) {
$output .= $this->output->notification(
get_string('predictionprocessfinished', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('predictionprocessfinished', 'tool_analytics'),
\core\output\notification::NOTIFY_SUCCESS);
} else if ($predictresults->status === \core_analytics\model::NO_DATASET ||
$predictresults->status === \core_analytics\model::NOT_ENOUGH_DATA) {
$output .= $this->output->notification(
get_string('nodatatopredict', 'tool_analytics'),
$output .= $OUTPUT->notification(get_string('nodatatopredict', 'tool_analytics'),
\core\output\notification::NOTIFY_WARNING);
} else {
$output .= $this->output->notification(
get_string('generalerror', 'tool_analytics', $predictresults->status),
$output .= $OUTPUT->notification(get_string('generalerror', 'tool_analytics', $predictresults->status),
\core\output\notification::NOTIFY_ERROR);
}
}
if (!empty($predictlogs) && debugging()) {
$output .= $this->output->heading(get_string('extrainfo', 'tool_analytics'), 4);
$output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 4);
foreach ($predictlogs as $log) {
$output .= $this->output->notification($log, \core\output\notification::NOTIFY_WARNING);
$output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
}
}
if (!CLI_SCRIPT) {
$output .= $this->output->single_button(new \moodle_url('/admin/tool/analytics/index.php'),
get_string('continue'), 'get');
$output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
}
return $output;
@@ -240,18 +236,17 @@ class renderer extends plugin_renderer_base {
* @return string HTML
*/
public function render_analytics_disabled() {
global $FULLME;
global $OUTPUT, $PAGE, $FULLME;
$this->page->set_url($FULLME);
$this->page->set_title(get_string('pluginname', 'tool_analytics'));
$this->page->set_heading(get_string('pluginname', 'tool_analytics'));
$PAGE->set_url($FULLME);
$PAGE->set_title(get_string('pluginname', 'tool_analytics'));
$PAGE->set_heading(get_string('pluginname', 'tool_analytics'));
$output = $this->output->header();
$output .= $this->output->notification(get_string('analyticsdisabled', 'analytics'),
\core\output\notification::NOTIFY_INFO);
$output = $OUTPUT->header();
$output .= $OUTPUT->notification(get_string('analyticsdisabled', 'analytics'), \core\output\notification::NOTIFY_INFO);
$output .= \html_writer::tag('a', get_string('continue'), ['class' => 'btn btn-primary',
'href' => (new \moodle_url('/'))->out()]);
$output .= $this->output->footer();
$output .= $OUTPUT->footer();
return $output;
}
+2 -2
View File
@@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2020061500; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2020060900; // Requires this Moodle version.
$plugin->version = 2019111800; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2019111200; // Requires this Moodle version.
$plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).
@@ -32,11 +32,8 @@ Feature: Manage availability conditions
Given the following "courses" exist:
| fullname | shortname | format |
| Course 1 | C1 | topics |
And the following "activity" exists:
| activity | page |
| course | C1 |
| name | P1 |
And I log in as "admin"
And I am on site homepage
When I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
# Check the icon is there (it should be a Hide icon, meaning is currently visible).
@@ -52,7 +49,8 @@ Feature: Manage availability conditions
# OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
And I click on "Hide" "icon" in the "Restriction by grade" "table_row"
And I am on the "P1" "page activity editing" page
And I am on "Course 1" course homepage with editing mode on
And I add a "Page" to section "1"
And I expand all fieldsets
And I click on "Add restriction..." "button"
And "Add restriction..." "dialogue" should be visible
@@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2020061500;
$plugin->requires = 2020060900;
$plugin->version = 2019111800;
$plugin->requires = 2019111200;
$plugin->component = 'tool_availabilityconditions';
-12
View File
@@ -1,12 +0,0 @@
define("tool_behat/steps",["exports","core/ajax","core/templates","core/pending"],(function(_exports,_ajax,_templates,_pending){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg),value=info.value}catch(error){return void reject(error)}info.done?resolve(value):Promise.resolve(value).then(_next,_throw)}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_ajax=_interopRequireDefault(_ajax),_templates=_interopRequireDefault(_templates),_pending=_interopRequireDefault(_pending);
/**
* Enhancements for the step definitions page.
*
* @module tool_behat/steps
* @copyright 2022 Catalyst IT EU
* @author Mark Johnson <mark.johnson@catalyst-eu.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
var getRequiredFieldsContent=function(entityData){var _entityData$required;return null!==(_entityData$required=entityData.required)&&void 0!==_entityData$required&&_entityData$required.length?_templates.default.renderForPromise("tool_behat/steprequiredfields",{fields:entityData.required}):Promise.resolve({html:"",js:""})};_exports.init=function(){var fn,_ref;document.addEventListener("change",(fn=regeneratorRuntime.mark((function _callee(e){var entityElement,stepElement,pendingPromise,entityData,_yield$getRequiredFie,html,js,stepRequiredFields;return regeneratorRuntime.wrap((function(_context){for(;;)switch(_context.prev=_context.next){case 0:if(entityElement=e.target.closest(".entities"),stepElement=e.target.closest(".stepcontent"),entityElement&&stepElement){_context.next=4;break}return _context.abrupt("return");case 4:return pendingPromise=new _pending.default("tool_behat/steps:change"),_context.next=7,entityType=e.target.value,_ajax.default.call([{methodname:"tool_behat_get_entity_generator",args:{entitytype:entityType}}])[0];case 7:return entityData=_context.sent,_context.next=10,getRequiredFieldsContent(entityData);case 10:if(_yield$getRequiredFie=_context.sent,html=_yield$getRequiredFie.html,js=_yield$getRequiredFie.js,!(stepRequiredFields=stepElement.querySelector(".steprequiredfields"))){_context.next=19;break}return _context.next=17,_templates.default.replaceNode(stepRequiredFields,html,js);case 17:_context.next=21;break;case 19:return _context.next=21,_templates.default.appendNodeContents(stepElement,html,js);case 21:pendingPromise.resolve();case 22:case"end":return _context.stop()}var entityType}),_callee)})),_ref=function(){var self=this,args=arguments;return new Promise((function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value)}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err)}_next(void 0)}))},function(_x){return _ref.apply(this,arguments)}))}}));
//# sourceMappingURL=steps.min.js.map
@@ -1 +0,0 @@
{"version":3,"file":"steps.min.js","sources":["../src/steps.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see <http://www.gnu.org/licenses/>.\n\nimport Ajax from 'core/ajax';\nimport Templates from 'core/templates';\nimport PendingJS from 'core/pending';\n\n/**\n * Enhancements for the step definitions page.\n *\n * @module tool_behat/steps\n * @copyright 2022 Catalyst IT EU\n * @author Mark Johnson <mark.johnson@catalyst-eu.net>\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * Call the get_entity_generator web service function\n *\n * Takes the name of an entity generator and returns an object containing a list of the required fields.\n *\n * @param {String} entityType\n * @returns {Promise}\n */\nconst getGeneratorEntities = (entityType) => Ajax.call([{\n methodname: 'tool_behat_get_entity_generator',\n args: {entitytype: entityType}\n}])[0];\n\n/**\n * Render HTML for required fields\n *\n * Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.\n *\n * @param {String} entityData\n * @return {Promise}\n */\nconst getRequiredFieldsContent = (entityData) => {\n if (!entityData.required?.length) {\n return Promise.resolve({\n html: '',\n js: ''\n });\n }\n return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});\n};\n\nexport const init = () => {\n // When an entity is selected in the \"the following exist\" step, fetch and display the required fields.\n document.addEventListener('change', async(e) => {\n const entityElement = e.target.closest('.entities');\n const stepElement = e.target.closest('.stepcontent');\n if (!entityElement || !stepElement) {\n return;\n }\n\n const pendingPromise = new PendingJS('tool_behat/steps:change');\n\n const entityData = await getGeneratorEntities(e.target.value);\n const {html, js} = await getRequiredFieldsContent(entityData);\n\n const stepRequiredFields = stepElement.querySelector('.steprequiredfields');\n if (stepRequiredFields) {\n await Templates.replaceNode(stepRequiredFields, html, js);\n } else {\n await Templates.appendNodeContents(stepElement, html, js);\n }\n pendingPromise.resolve();\n });\n};\n"],"names":["getRequiredFieldsContent","entityData","required","_entityData$required","length","Templates","renderForPromise","fields","Promise","resolve","html","js","document","addEventListener","e","entityElement","target","closest","stepElement","pendingPromise","PendingJS","entityType","value","Ajax","call","methodname","args","entitytype","stepRequiredFields","querySelector","replaceNode","appendNodeContents"],"mappings":";;;;;;;;;IAiDMA,yBAA2B,SAACC,yEACzBA,WAAWC,0CAAXC,qBAAqBC,OAMnBC,mBAAUC,iBAAiB,gCAAiC,CAACC,OAAQN,WAAWC,WAL5EM,QAAQC,QAAQ,CACnBC,KAAM,GACNC,GAAI,oBAMI,uBAEhBC,SAASC,iBAAiB,sCAAU,iBAAMC,oNAChCC,cAAgBD,EAAEE,OAAOC,QAAQ,aACjCC,YAAcJ,EAAEE,OAAOC,QAAQ,gBAChCF,eAAkBG,kFAIjBC,eAAiB,IAAIC,iBAAU,2CAhCfC,WAkCwBP,EAAEE,OAAOM,MAlClBC,cAAKC,KAAK,CAAC,CACpDC,WAAY,kCACZC,KAAM,CAACC,WAAYN,eACnB,iBA+BUpB,0CACmBD,yBAAyBC,2DAA3CS,2BAAAA,KAAMC,yBAAAA,KAEPiB,mBAAqBV,YAAYW,cAAc,wEAE3CxB,mBAAUyB,YAAYF,mBAAoBlB,KAAMC,mEAEhDN,mBAAU0B,mBAAmBb,YAAaR,KAAMC,YAE1DQ,eAAeV,mDA3CM,IAACY"}
-82
View File
@@ -1,82 +0,0 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
import Ajax from 'core/ajax';
import Templates from 'core/templates';
import PendingJS from 'core/pending';
/**
* Enhancements for the step definitions page.
*
* @module tool_behat/steps
* @copyright 2022 Catalyst IT EU
* @author Mark Johnson <mark.johnson@catalyst-eu.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Call the get_entity_generator web service function
*
* Takes the name of an entity generator and returns an object containing a list of the required fields.
*
* @param {String} entityType
* @returns {Promise}
*/
const getGeneratorEntities = (entityType) => Ajax.call([{
methodname: 'tool_behat_get_entity_generator',
args: {entitytype: entityType}
}])[0];
/**
* Render HTML for required fields
*
* Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.
*
* @param {String} entityData
* @return {Promise}
*/
const getRequiredFieldsContent = (entityData) => {
if (!entityData.required?.length) {
return Promise.resolve({
html: '',
js: ''
});
}
return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});
};
export const init = () => {
// When an entity is selected in the "the following exist" step, fetch and display the required fields.
document.addEventListener('change', async(e) => {
const entityElement = e.target.closest('.entities');
const stepElement = e.target.closest('.stepcontent');
if (!entityElement || !stepElement) {
return;
}
const pendingPromise = new PendingJS('tool_behat/steps:change');
const entityData = await getGeneratorEntities(e.target.value);
const {html, js} = await getRequiredFieldsContent(entityData);
const stepRequiredFields = stepElement.querySelector('.steprequiredfields');
if (stepRequiredFields) {
await Templates.replaceNode(stepRequiredFields, html, js);
} else {
await Templates.appendNodeContents(stepElement, html, js);
}
pendingPromise.resolve();
});
};
@@ -1,92 +0,0 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Return data about an entity generator.
*
* @package tool_behat
* @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
* @author Mark Johnson <mark.johnson@catalyst-eu.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_behat\external;
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/externallib.php');
/**
* External function for getting properties of entity generators.
*/
class get_entity_generator extends \external_api {
/**
* Define parameters for external function.
*
* The parameter is either in the format 'entity' or 'component_name > entity'. There is no appropriate param type for a
* string like this containing angle brackets, so we will do PARAM_RAW. The value will be parsed by
* behat_data_generators::parse_entity_type, which validates the format of the parameter and throws an exception if it is not
* correct.
*
* @return \external_function_parameters
*/
public static function execute_parameters(): \external_function_parameters {
return new \external_function_parameters([
'entitytype' => new \external_value(PARAM_RAW, 'Entity type that can be created by a generator.'),
]);
}
/**
* Return a list of the required fields for a given entity type.
*
* @param string $entitytype
* @return array
*/
public static function execute(string $entitytype): array {
global $CFG;
// Ensure we can load Behat and Facebook namespaces in behat libraries.
require_once("{$CFG->dirroot}/vendor/autoload.php");
require_once("{$CFG->libdir}/tests/behat/behat_data_generators.php");
$params = self::validate_parameters(self::execute_parameters(), ['entitytype' => $entitytype]);
$context = \context_system::instance();
self::validate_context($context);
require_capability('moodle/site:config', $context);
$generators = new \behat_data_generators();
$entity = $generators->get_entity($params['entitytype']);
return ['required' => $entity['required']];
}
/**
* Define return values.
*
* Return required fields
*
* @return \external_single_structure
*/
public static function execute_returns(): \external_single_structure {
return new \external_single_structure([
'required' => new \external_multiple_structure(
new \external_value(PARAM_TEXT, 'Required field'),
'Required fields',
VALUE_OPTIONAL
),
]);
}
}
+4 -5
View File
@@ -45,7 +45,7 @@ list($options, $unrecognised) = cli_get_params(
array(
'stop-on-failure' => 0,
'verbose' => false,
'replace' => '',
'replace' => false,
'help' => false,
'tags' => '',
'profile' => '',
@@ -70,7 +70,7 @@ $help = "
Behat utilities to run behat tests in parallel
Usage:
php run.php [--BEHAT_OPTION=\"value\"] [--feature=\"value\"] [--replace=\"{run}\"] [--fromrun=value --torun=value] [--help]
php run.php [--BEHAT_OPTION=\"value\"] [--feature=\"value\"] [--replace] [--fromrun=value --torun=value] [--help]
Options:
--BEHAT_OPTION Any combination of behat option specified in http://behat.readthedocs.org/en/v2.5/guides/6.cli.html
@@ -144,10 +144,9 @@ $extraopts = $unrecognised;
if ($options['profile']) {
$profile = $options['profile'];
// If profile passed is not set, then exit (note we skip if the 'replace' option is found within the 'profile' value).
// If profile passed is not set, then exit.
if (!isset($CFG->behat_config[$profile]) && !isset($CFG->behat_profiles[$profile]) &&
!($options['replace'] && (strpos($profile, (string) $options['replace']) !== false))) {
!(isset($options['replace']) && (strpos($options['profile'], $options['replace']) >= 0 ))) {
echo "Invalid profile passed: " . $profile . PHP_EOL;
exit(1);
}
-1
View File
@@ -56,7 +56,6 @@ if ($components) {
$form = new steps_definitions_form(null, array('components' => $componentswithsteps));
// Output contents.
$PAGE->requires->js_call_amd('tool_behat/steps', 'init');
$renderer = $PAGE->get_renderer('tool_behat');
echo $renderer->render_stepsdefinitions($steps, $form);
-1
View File
@@ -46,7 +46,6 @@ $string['stepsdefinitionstype'] = 'Type';
$string['theninfo'] = 'Then. Checkings to ensure the outcomes are the expected ones';
$string['unknownexceptioninfo'] = 'There was a problem with Selenium or your browser. Please ensure you are using the latest version of Selenium. Error:';
$string['viewsteps'] = 'Filter';
$string['warndirrootconfigfound'] = 'A configuration file was found at {$a}. This file is not automatically updated and may become stale. We recommend removing this file.';
$string['wheninfo'] = 'When. Action that provokes an event';
$string['wrongbehatsetup'] = 'Something is wrong with the behat setup and so step definitions cannot be listed: <b>{$a->errormsg}</b><br/><br/>Please check:<ul>
<li>$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot are set in config.php with different values from $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.</li>
-28
View File
@@ -24,8 +24,6 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/behat/classes/behat_generator_base.php');
/**
* Renderer for behat tool web features
*
@@ -108,32 +106,6 @@ class tool_behat_renderer extends plugin_renderer_base {
},
$stepsdefinitions
);
$elementstrings = [];
$count = 1;
$stepsdefinitions = preg_replace_callback('/(the following ")ELEMENT\d?_STRING(" exist:)/',
function($matches) use (&$elementstrings, &$count) {
// Replace element type arguments with a user-friendly select.
if (empty($elementstrings)) {
$behatgenerators = new behat_data_generators();
$componententities = $behatgenerators->get_all_entities();
ksort($componententities);
$elementstrings = [];
foreach ($componententities as $component => $entities) {
asort($entities);
foreach ($entities as $entity) {
$string = ($component === 'core') ? $entity : $component . ' > ' . $entity;
$elementstrings[$string] = $string;
}
}
}
$select = html_writer::select($elementstrings, 'entities' . $count, '', ['' => 'choosedots'],
['class' => 'entities']);
$count++;
return $matches[1] . $select . $matches[2];
},
$stepsdefinitions
);
}
// Steps definitions.
-6
View File
@@ -29,9 +29,3 @@
#page-admin-tool-behat-index .steps-definitions .stepregex {
color: #060;
}
#page-admin-tool-behat-index .steprequiredfields {
font-weight: bold;
font-size: 1em;
margin-top: 1em;
}
@@ -1,33 +0,0 @@
{{!
This file is part of Moodle - https://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template tool_behat/steprequiredfields
Display a Gherkin-style table row showing required columns for a step.
Example context (json):
{
"fields": [
"user",
"role",
"context"
]
}
}}
<pre class="steprequiredfields">
|{{#fields}} {{{.}}} |{{/fields}}
</pre>
@@ -105,7 +105,8 @@ Feature: Set up contextual data for tests
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
When I am on the "Course 1" course page logged in as student1
When I log in as "student1"
And I am on "Course 1" course homepage
Then I should see "Topic 1"
Scenario: Add role assigns
@@ -139,17 +140,23 @@ Feature: Set up contextual data for tests
When I log in as "user1"
And I am on site homepage
Then "Edit settings" "link" should exist in current page administration
And I am on the "Course 1" course page logged in as user2
And "Turn editing on" "button" should exist
And I am on the "Course 1" course page logged in as user3
And "Turn editing on" "button" should exist
And I am on the "Course 1" course page logged in as user4
And "Turn editing on" "button" should exist
And I log out
And I log in as "user2"
And I am on "Course 1" course homepage
And "Turn editing on" "link" should exist in current page administration
And I log out
And I log in as "user3"
And I am on "Course 1" course homepage
And "Turn editing on" "link" should exist in current page administration
And I log out
And I log in as "user4"
And I am on "Course 1" course homepage
And "Turn editing on" "link" should exist in current page administration
And I log out
And I log in as "user5"
And I should see "You are logged in as"
And I am on "Course 1" course homepage
And I should see "You cannot enrol yourself in this course."
And I should see "You can not enrol yourself in this course."
Scenario: Add modules
Given the following "courses" exist:
@@ -185,7 +192,8 @@ Feature: Set up contextual data for tests
And the following "activities" exist:
| activity | name | intro | course | idnumber | grade |
| assign | Test assignment name with scale | Test assignment description | C1 | assign1 | Test Scale 1 |
When I am on the "Course 1" course page logged in as admin
When I log in as "admin"
And I am on "Course 1" course homepage
Then I should see "Test assignment name"
# Assignment 2.2 module type is disabled by default
# And I should see "Test assignment22 name"
@@ -251,9 +259,9 @@ Feature: Set up contextual data for tests
Then the "groups" select box should contain "Group 1 (1)"
And the "groups" select box should contain "Group 2 (1)"
And I set the field "groups" to "Group 1 (1)"
And the "members" select box should contain "Student 1 (student1@example.com)"
And the "members" select box should contain "Student 1"
And I set the field "groups" to "Group 2 (1)"
And the "members" select box should contain "Student 2 (student2@example.com)"
And the "members" select box should contain "Student 2"
Scenario: Add cohorts and cohort members with data generator
Given the following "categories" exist:
@@ -303,7 +311,9 @@ Feature: Set up contextual data for tests
And the following "grade categories" exist:
| fullname | course | gradecategory |
| Grade sub category 2 | C1 | Grade category 1 |
When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin"
When I log in as "admin"
And I am on "Course 1" course homepage
And I navigate to "View > Grader report" in the course gradebook
Then I should see "Grade category 1"
And I should see "Grade sub category 2"
@@ -324,7 +334,9 @@ Feature: Set up contextual data for tests
| itemname | course | gradecategory |
| Test Grade Item 2 | C1 | Grade category 1 |
| Test Grade Item 3 | C1 | Grade sub category 2 |
When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
When I log in as "admin"
And I am on "Course 1" course homepage
And I navigate to "Setup > Gradebook setup" in the course gradebook
Then I should see "Test Grade Item 1"
And I follow "Edit Test Grade Item 1"
And I expand all fieldsets
@@ -350,7 +362,9 @@ Feature: Set up contextual data for tests
And the following "scales" exist:
| name | scale |
| Test Scale 1 | Disappointing, Good, Very good, Excellent |
When I am on the "Course 1" "grades > scales" page logged in as admin
When I log in as "admin"
And I am on "Course 1" course homepage
And I navigate to "Scales" in the course gradebook
Then I should see "Test Scale 1"
And I should see "Disappointing, Good, Very good, Excellent"
@@ -369,7 +383,9 @@ Feature: Set up contextual data for tests
| Grade outcome 2 | OT2 | C1 | Test Scale 1 |
And the following config values are set as admin:
| enableoutcomes | 1 |
When I am on the "Course 1" "grades > outcomes" page logged in as admin
When I log in as "admin"
And I am on "Course 1" course homepage
And I follow "Outcomes"
Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
And I follow "Edit outcomes"

Some files were not shown because too many files have changed in this diff Show More