97734 Commits

Author SHA1 Message Date
Víctor Déniz Falcón
c49d8663ad MDL-67810 core_contentbank: contenttype_h5p editor integrated 2020-05-27 10:27:55 +01:00
Victor Deniz Falcon
613281cd25 MDL-67810 core_contentbank: placed the edit action in the view page 2020-05-27 10:27:13 +01:00
Victor Deniz Falcon
a99dab944f MDL-67810 core_contentbank: contentype_h5p modified to support add menu 2020-05-27 10:27:13 +01:00
Víctor Déniz Falcón
75f58cbfa2 MDL-67810 core_contentbank: added dropdown menu to create content 2020-05-27 10:27:13 +01:00
Eloy Lafuente (stronk7)
68fd8d8bdf on-demand release 3.9dev+ 2020-05-26 22:52:49 +02:00
Sara Arjona
54b97575d1 Merge branch 'MDL-68388' of https://github.com/stronk7/moodle 2020-05-26 20:03:22 +02:00
Eloy Lafuente (stronk7)
60fe1f8c9d 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:00:24 +02:00
Sara Arjona
309b4d0111 Merge branch 'MDL-67386-master-hotfix' of github.com:bmbrands/moodle 2020-05-26 16:23:20 +02:00
Bas Brands
203eed43e2 MDL-67386 theme_classic: initialize the bootstrap loader. 2020-05-26 14:20:33 +02:00
Jun Pataleta
8aa0f2c4d8 Merge branch 'MDL-45184-master' of git://github.com/junpataleta/moodle 2020-05-26 12:39:24 +08:00
Jun Pataleta
86c0f3cfd0 MDL-45184 tool_licensemanager: Behat fixes
* Fix license manager test
* Remove unnecessary @javascript tags
* Remove unnecessary "I log out" steps
* Fix structure so each scenario will have a single Given-When-Then
2020-05-26 12:29:09 +08:00
Jun Pataleta
cd4ec9b33b MDL-45184 tool_licensemanager: Move $deletelicense for proper scope 2020-05-26 12:11:07 +08:00
Andrew Nicols
fa197fbf09 Merge branch 'MDL-68099-master' of git://github.com/marinaglancy/moodle 2020-05-26 11:29:48 +08:00
Adrian Greeve
b2978c1787 Merge branch 'MDL-68757' of https://github.com/timhunt/moodle 2020-05-26 10:33:03 +08:00
Andrew Nicols
17238ab079 MDL-68388 grade: Tidy comments and whitespace 2020-05-26 10:15:52 +08:00
Andrew Nicols
a7aaf91855 Merge branch 'MDL-68388' of https://github.com/marcusboon/moodle 2020-05-26 10:11:08 +08:00
Tom Dickman
4399e4759a MDL-45184 tool_licenses: Add custom licenses
This feature adds an admin tool for creating custom licenses.
Now custom licenses can be added and amended in Moodle, and the site
default can be set to a custom license.

Core licenses remain hard-coded and are uneditable, so they will always
require update within Moodle core updates, and maintain their
internationalisation through core language strings.

This also includes fundamental changes to the license API including
the addition of license caching and deprecation of no longer required
admin settings for license management.
2020-05-26 12:08:05 +10:00
Andrew Nicols
ecf526566a Merge branch 'MDL-64427' of https://github.com/NeillM/moodle 2020-05-26 10:04:51 +08:00
Andrew Nicols
7d02452504 Merge branch 'MDL-67547' of https://github.com/paulholden/moodle 2020-05-26 08:06:39 +08:00
Andrew Nicols
1a3a864a4a Merge branch 'MDL-68270-master' of git://github.com/bmbrands/moodle 2020-05-26 08:02:50 +08:00
Victor Deniz Falcon
a735d4d1d4 Merge branch 'MDL-68252' of https://github.com/timhunt/moodle 2020-05-26 00:55:02 +01:00
Paul Holden
f8f5a2f6da MDL-67547 mod_forum: convert pluginfile URLs prior to export. 2020-05-26 00:54:51 +01:00
Paul Holden
233a51ad21 MDL-67547 dataformat_pdf: method to convert images to supported format.
For Dataformats that support exporting HTML content, provide an API for
converting images within that content to something suitable for the format.

This fixes an issue with the PDF writer when it encountered a pluginfile.php
image, which it tried to request via HTTP without an active session. This
resulted in a 303 header returned by Moodle instead of the actual image,
causing an exception in the underlying TCPDF library.
2020-05-26 00:54:27 +01:00
Adrian Greeve
ef17275726 Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle 2020-05-26 07:48:53 +08:00
Marcus Boon
f1f5ba36ad 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:06:50 +10:00
Sara Arjona
a706f7161f Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle 2020-05-25 17:58:39 +02:00
Sara Arjona
36e2a9af84 MDL-67386 theme_boost: update latest CSS changes 2020-05-25 17:57:34 +02:00
Sara Arjona
028d43b37d Merge branch 'MDL-67386-master' of git://github.com/bmbrands/moodle 2020-05-25 17:46:41 +02:00
Sara Arjona
16b55f1cad Merge branch 'MDL-68177-master_course_renderer_split_methods' of https://github.com/roland04/moodle 2020-05-25 17:11:03 +02:00
Mikel Martín
ebd08abce8 MDL-68177 course: split course_info_box into different methods 2020-05-25 16:14:37 +02:00
Bas Brands
f0947b944c MDL-68270 core_output: prevent blurring of navbar logo 2020-05-25 15:48:52 +02:00
Bas Brands
6a4ce7b0a3 MDL-67386 theme_boost: upgrade bootstrap to version 4.5.0 2020-05-25 15:48:17 +02:00
Sara Arjona
1b88f7567a Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle 2020-05-25 15:47:44 +02:00
Andrew Nicols
b5b9166831 Merge branch 'MDL-68103-master' of git://github.com/bmbrands/moodle 2020-05-25 19:55:11 +08:00
Bas Brands
9d2d2c2beb MDL-68103 theme_classic: show content full width when printing 2020-05-25 13:48:42 +02:00
Andrew Nicols
35f5bf4abc Merge branch 'MDL-68549' of https://github.com/HuongNV13/moodle 2020-05-25 19:10:21 +08:00
Michael Hawkins
d26b3ad524 MDL-68348 user: Added filterset joins unit testing 2020-05-25 18:35:08 +08:00
Michael Hawkins
4fa636330f MDL-68348 user: Added other logical operators to filter unit tests 2020-05-25 18:35:08 +08:00
Michael Hawkins
6a54e58a8c MDL-68348 user: User filter match types support - enrol method & status
Completed support for all join types (any/all/none) for enrolment
method and status filtering. This includes handling forced status
filtering where a user does not have the capability to view suspended
users, as well as handling front page (whole site) participants page.
2020-05-25 18:35:08 +08:00
Michael Hawkins
03397c817b MDL-68348 lib: User filter match types support - groups
Updated groups_get_members_join to support different filter match types
2020-05-25 18:35:08 +08:00
Michael Hawkins
25d9dabdcf MDL-68348 user: User filter match types support - keywords/last access
The last access implementation also fixes an existing bug,
where it was assumed never accessed would be 0, when it also needed to
handle null to return correct results. Related userlib unit tests also
updated to reflect this, as well as some incorrect comment wording.
2020-05-25 18:35:08 +08:00
Michael Hawkins
4157e2d4f3 MDL-68348 lib: Added create_user_course_lastaccess generator
This creates a last access record for a user within a course.
It is requires for testing accesssince participants filtering.
2020-05-25 18:10:53 +08:00
Michael Hawkins
25d5be444f MDL-68348 user: User filter match types support - filterset and roles 2020-05-25 18:10:53 +08:00
Michael Hawkins
3f069a2c48 MDL-68348 lib: Default filters to match ALL for backwards compatibility
Temporarily defaulting filtersets and their filters to join type ALL
for backwards compatibility, so the existing participants unified
filter continues to function consistently. This will be reverted once
the new participants filter UI replaces the existing unified filter.
2020-05-25 18:10:53 +08:00
Sara Arjona
71dbe42c64 Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle 2020-05-25 11:59:24 +02:00
Nick Phillips
7a2baafc96 MDL-68103 theme_classic: hidden-print => d-print-none for BS4. 2020-05-25 11:40:14 +02:00
Sara Arjona
9073ed9355 Merge branch 'MDL-68448-master-fix' of github.com:sarjona/moodle 2020-05-25 11:37:41 +02:00
Sara Arjona
0a7c9b9d63 MDL-68448 h5pactivity: remove illegal whitespaces 2020-05-25 11:35:15 +02:00
Sara Arjona
51b3feb2e9 Merge branch 'MDL-68448-master' of git://github.com/cescobedo/moodle 2020-05-25 10:56:18 +02:00
Adrian Greeve
e1f4258906 Merge branch 'MDL-68629_master' of https://github.com/t-schroeder/moodle 2020-05-25 16:14:54 +08:00