1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00

94354 Commits

Author SHA1 Message Date
Andrew Nicols
417e334b91 Merge branch 'MDL-65409-master' of git://github.com/mihailges/moodle 2019-07-16 11:35:23 +08:00
Jake Dallimore
e83765bcf1 Merge branch 'MDL-66158-master' of git://github.com/andrewnicols/moodle 2019-07-16 10:30:52 +08:00
Andrew Nicols
444f85aaa9 MDL-66158 calendar: Events should be space separated not an array 2019-07-16 09:46:02 +08:00
Mathew May
d7b43fd9cf MDL-65761 lib: Update scssphp to 1.0.2 2019-07-16 09:29:37 +08:00
Mathew May
f619e305a0 MDL-65761 lib: Update scssphp to 1.0.0 2019-07-16 09:16:44 +08:00
Nathan Nguyen
a81f5d0b1a MDL-65555 mod_lesson: fix group override backup and restore 2019-07-16 11:16:03 +10:00
Nathan Nguyen
4d3bc85866 MDL-65555 mod_quiz: fix group override backup and restore 2019-07-16 11:16:03 +10:00
Mathew May
358d571156 MDL-65761 lib: Update scssphp to 0.8.3 2019-07-16 09:15:21 +08:00
Andrew Madden
7599223a1c MDL-66032 badges: Prevent empty awarded badges criteria being created.
When creating or editing the awarded badges criteria, the select element should be
required to prevent empty criteria from being created. In addition, if there are
already badges created with the empty criteria, there should be not be an exception
thrown when assessing whether the criteria has been completed.
2019-07-16 09:31:25 +10:00
Andrew Nicols
a21f471e12 Merge branch 'MDL-65928-master-2' of git://github.com/junpataleta/moodle 2019-07-16 07:18:17 +08:00
Eloy Lafuente (stronk7)
c4e14e535e Merge branch 'MDL-62836-master' of git://github.com/sarjona/moodle 2019-07-15 23:56:39 +02:00
Sara Arjona
3e8f9b2869 MDL-65538 competency: fix behat errors with firefox
There is a random behat error when executing the "Go to the competency
course competencies page." scenario: "Moodle exception: A required parameter
(courseid) was missing More information about this error".
It happens because sometimes the form is sent before the JS and it hasn't
the needed parameters defined. So they have been added as hidden to the
form to avoid the error (which I couldn't reproduce manually).
2019-07-15 13:48:56 +02:00
Eloy Lafuente (stronk7)
e9514b4df9 Merge branch 'MDL-58026-master' of https://github.com/MartinGauk/moodle 2019-07-15 13:38:44 +02:00
Bas Brands
c5b2ab4786 MDL-63612 core_admin: make course card colours configurable 2019-07-15 11:01:20 +02:00
David Monllaó
2ffdcd78d3 MDL-66026 analytics: No notification if not necessary 2019-07-15 14:24:21 +08:00
Jun Pataleta
c5681f7ff1 MDL-60013 amd: Final removal of core/modal_confirm 2019-07-15 13:37:01 +08:00
Peter
ee1062686c MDL-66021 backup: Clear course if required before restore 2019-07-15 13:16:50 +08:00
Jun Pataleta
b3f4d77e00 MDL-65954 dataformat_pdf: Convert object records to array
* count() doesn't work quite as expected when the record being written
to the PDF is an object. So make sure to convert the record to an array.
* In addition, instead of comparing the total vs the current cell
counter, it would be more reliable to determine whether we're at the
last element of the array by getting the key for the last element and
comparing it with the key for the element that's currently being
processed.
2019-07-15 10:29:59 +08:00
Mihail Geshoski
88d2bc81c8 MDL-65751 lib: Update jQuery version in Moodle files 2019-07-15 08:45:34 +08:00
Mihail Geshoski
c40548366b MDL-65751 lib: Upgrade jQuery lib to 3.4.1 2019-07-15 08:45:34 +08:00
Mihail Geshoski
324aa89ac4 MDL-65742 lib: Update HTMLPurifier version in Moodle related files 2019-07-15 08:43:16 +08:00
Mihail Geshoski
e80855b0da MDL-65742 lib: Upgrade HTMLPurifier lib to 4.10.0 2019-07-15 08:43:16 +08:00
Peter
e35cc9fea9 MDL-65908 mod_assign: Remove scroll repositioning.
Absolute positioned elements do not require repositioning on scroll as long as
their immediate parent is relatively positioned.
2019-07-15 08:35:58 +08:00
Mathew May
25d31d43b7 MDL-65788 tool_policy: Prevent two modals rendering for guests.
With the Guest registration calling policyactions.js the [data-action="view"]
was having two click handlers set on the inital policy modal trgger.
With this commit we state what we want the click event to be set on.
2019-07-14 18:52:27 +08:00
AMOS bot
bf11226094 Automatically generated installer lang files 2019-07-14 00:08:42 +00:00
David Castro
39260e3ead MDL-66115 qtype_ddimageortext: Fixing choice deletion.
Summarising responses fails when question choices have been removed.

AMOS BEGIN
CPY [deletedchoice,qtype_match],[deletedchoice,qtype_ddimageortext]
AMOS END

(cherry picked from commit f0265e6db16caa6d13f8bce291e7da91b0eabb53)
2019-07-12 14:36:32 -05:00
Silvia Pinheiro
ae1556ad93 MDL-62836 badges: Add behat test for the new group selector 2019-07-12 18:13:37 +02:00
Silvia Pinheiro
b1e63fc7e2 MDL-62836 badges: Potential badge recipients by group
This affects the case when a badge is setup with the criteria "manual issue by role".
The non-editing teacher can see all participants of the course, when awarding a badge, even with SEPARATE GROUPS mode enabled.
With this change, when the non-editing teacher chooses a group, and searches for a user, the results are filtered for that group.
The same happens for "Existing badge recipients by group" when revoking a badge.
2019-07-12 18:13:37 +02:00
sam marshall
ed73ff2b0e MDL-66132 Search: Behat tests should use simpledb, fix mock count
When searching using mock results (the 'global search expects the
query' step), the result count is not correctly set. As a result, the
page incorrectly reports that there are no results and doesn't
correctly show the first page of multi-page results.

Additionally, some of the core Behat tests can now be moved to use
real searching with the simpledb engine, rather than using mock
results at all. This gives better tests.

Unfortunately it was not possible to move all of the core Behat tests
and deprecate the mock step, because some of the tests are related to
the UI for 'special' features searching by user or group, neither of
which are supported by the simpledb engine.
2019-07-12 15:31:30 +01:00
Jun Pataleta
622d83d7bc MDL-65928 mod_choice: Use proper string for 'select/deselect all' labels
* Because string concatenation is bad!
2019-07-12 16:33:35 +08:00
Jun Pataleta
05b25140d0 MDL-65928 core: Use 'starts with' for non-exact toggle group matching
* Use the 'starts with' selector when matching toggle groups by name in
  non-exact mode to avoid potential conflicts with other toggle groups.
* Note down the required data attributes for JS in the template
  documentations.
* Add a note of this output component in upgrade.txt.
* Add doc blocks for the core/checkbox-toggleall attributes and methods.
2019-07-12 16:33:29 +08:00
Jun Pataleta
71eadbec62 MDL-65928 mod_choice: Add select/deselect all master button 2019-07-12 14:36:35 +08:00
Jun Pataleta
c7ad9f3439 MDL-65928 mod_choice: Use core/checkbox_toggleall 2019-07-12 14:36:35 +08:00
Jun Pataleta
2abd969cc5 MDL-65928 core: Split toggle-all elements into separate templates
For cleaner templates, split checkbox toggle-all elements into three
templates:
* master checkbox (master control rendered as a checkbox)
* master button (master control rendered as a button)
* slave checkbox
2019-07-12 14:36:35 +08:00
Jun Pataleta
5943fc3f95 MDL-65928 core: Render master element as button too 2019-07-12 14:36:35 +08:00
Jun Pataleta
6259a9d065 MDL-65928 core: Create a checkbox_toggleall renderable 2019-07-12 14:36:35 +08:00
Jun Pataleta
0a3d306358 MDL-65928 core_amd: Let checkboxes belong to multiple toggle groups 2019-07-12 14:36:35 +08:00
Jun Pataleta
686ab8cc74 MDL-65928 core_amd: Add support for action elements
Enable/disable action elements that are associated with the toggle
group.
2019-07-12 14:36:35 +08:00
Mark Nelson
7fa4e41052 MDL-65794 core: no need for sesskey when login not required 2019-07-12 13:03:43 +08:00
Peter
e349db4b4a MDL-65908 assign: Overflow and positioning updates
Draw all annotation within the drawing canvas instead of the region
2019-07-12 09:56:31 +08:00
Peter
2269b06cbc MDL-65908 assign: Revert overflow scroll fix
Revert "MDL-65484 assign: Scrolling overflow CSS"

This reverts commit 5bda066caa88bace064bdf6a2ab471c56e07f4c4.
2019-07-12 09:56:31 +08:00
Damyon Wiese
27b67f6b5a MDL-65409 files: Allow location header
Allow incorrect capitals in location header response.
2019-07-12 08:42:20 +08:00
Mihail Geshoski
247206c970 MDL-65763 lib: Update GeoIP2 and MaxMind DB reader versions in Moodle 2019-07-12 08:17:46 +08:00
Mihail Geshoski
b55260fcfb MDL-65763 lib: Upgrade MixMind DB reader lib to 1.4.1 2019-07-12 08:17:46 +08:00
Mihail Geshoski
e952e8a425 MDL-65763 lib: Upgrade GeoIP2 lib to 2.9.0 2019-07-12 08:17:46 +08:00
John Yao
96e444665e MDL-65517 block_timeline: Hide completed course modules in Timeline
When some activities are manually completed by students, some are still showing in students' timeline.
This commit fix that for module assign,chat,choice,feedback,lesson,quiz,scorm and workshop.
2019-07-12 09:16:40 +10:00
David Monllaó
b209893dd0 MDL-65769 mlbackend_php: Proper algo init & unit test fix 2019-07-12 06:28:31 +08:00
Simey Lameze
3e99b44088 MDL-65769 lib: update PHP-ML thirdpartylibs.xml 2019-07-12 06:28:31 +08:00
Simey Lameze
e6c25fb057 MDL-65769 lib: update PHP-ML to 0.8.0 2019-07-12 06:28:31 +08:00
Eloy Lafuente (stronk7)
f7e108438f weekly release 3.8dev 2019-07-11 23:33:29 +02:00