Commit graph

95708 commits

Author SHA1 Message Date
Sara Arjona
3a9c515057 Merge branch 'MDL-66683-master' of git://github.com/cescobedo/moodle 2019-11-07 17:41:22 +01:00
cescobedo
5d69038bb6 MDL-66683 core: Revert MDL-66181 because created regressions
This reverts commit ed080a580f.
This issue reverts the behaviour modified in MDL-66181, as that change
negatively impacted course-creation workflows. As this appears to be
the intended functionality, the Security team has agreed to revert
this change.
2019-11-07 17:29:30 +01:00
Michael Hawkins
209cfe64fb MDL-67122 forumreport_summary: Fix template context eg and line length
The template context needed updating now it populates a single select
and the summary_table constructor params should be broken over 2 lines
2019-11-08 00:15:48 +08:00
Jake Dallimore
78d65acd54 MDL-66257 tool_cohortroles: unit test for users in multiple cohorts 2019-11-07 23:47:18 +08:00
cescobedo
7b5f4a62c1 MDL-66257 tool_cohortroles: Unassign the role on removal cohortroles. 2019-11-07 23:47:17 +08:00
Michael Hawkins
30fc34761b MDL-67122 forumreport_summary: Apply filters to report download 2019-11-07 23:42:34 +08:00
Sara Arjona
830eab425c Merge branch 'MDL-67166-master' of git://github.com/bmbrands/moodle 2019-11-07 16:30:18 +01:00
Bas Brands
fda23bf7cd MDL-67129 atto_h5p: uneditable .h5p-placeholder container 2019-11-07 14:06:38 +01:00
Eloy Lafuente (stronk7)
a5cd14e4d8 MDL-67169 phpunit: fix clear flaw in unit test provider
Basically the provider is ignoring the CRLF to LF normalization
results and loading the original file again.

This doesn't have any impact normally, because all moodle
files are LF ones and people using other systems have their
git configurations set to work that way (not modify or force LF).

But there may be checkouts out there (for example travis) where
the git configuration by defult is to convert to the OS, causing
windows runs to fail badly there. See the issue for more info
and links.
2019-11-07 13:44:06 +01:00
Juan Leyva
ff490afbff MDL-67167 block: Force returned configuration values to be JSON encoded
Contributed plugins may set non-scalar values as valid instance configuration values (the core RSS client block does the same)
2019-11-07 13:29:52 +01:00
Jun Pataleta
af9a491478 Merge branch 'MDL-67084-master' of git://github.com/junpataleta/moodle 2019-11-07 19:40:55 +08:00
Marina Glancy
9f2c665999 MDL-67084 core_form: duration element should export arrays 2019-11-07 19:21:16 +08:00
Jun Pataleta
c4e1c9d167 MDL-66598 auth_oauth2: OAuth2 upgrade step
This basically does two things:
1. Updates all non-Facebook/Google/Microsoft issuers and sets their
'requireconfirmation' field to 1 so that future OAuth2 logins on these
issuers will always have an email confirmation sent to them.
2. Deletes the linked logins of users with non-Facebook/Google/Microsoft
OAuth2 issuers.
2019-11-07 18:42:07 +08:00
Jun Pataleta
8a3316bd9b MDL-66598 auth_oauth2: Add warning messages in confirm emails 2019-11-07 18:42:07 +08:00
Jun Pataleta
df6092d65c MDL-66598 tool_oauth2: Make account confirmation required by default
* Only Facebook, Google, and Microsoft issuers can optionally offer to
require account confirmation via email. We will require email
confirmation for the rest of the issuers.
2019-11-07 18:42:07 +08:00
Bas Brands
5092133b8f MDL-67166 theme_classic: H5P embedded styles 2019-11-07 10:57:39 +01:00
cescobedo
0477e526e4 MDL-66404 core_h5p: Add new h5p_deleted event 2019-11-07 10:43:20 +01:00
cescobedo
fba5bba829 MDL-66404 core_h5p: Add new h5p_viewed event 2019-11-07 10:43:13 +01:00
Amaia Anabitarte
21cb97560a MDL-67110 filter_h5p: Removing wildcard characters 2019-11-07 10:27:53 +01:00
Amaia Anabitarte
b57e1c9590 MDL-67059 core_h5p: UI to manually upload H5P content type libraries
Co-authored by: Mihail Geshoski <mihail@moodle.com>
2019-11-07 16:54:28 +08:00
cescobedo
65ae2441f3 MDL-67043 core_h5p: Add new ws to get the H5P trusted file 2019-11-07 08:47:25 +01:00
Jun Pataleta
cf29a4857a Merge branch 'MDL-66701_master' of git://github.com/dmonllao/moodle 2019-11-07 15:41:45 +08:00
David Monllaó
d7d52aae15 MDL-66701 report_insights: Target's extra info on the insights report 2019-11-07 15:09:15 +08:00
emdalton
05b0e3158c MDL-66701 analytics: Insights report descriptions 2019-11-07 15:09:14 +08:00
Ryan Wyllie
2667acf121 MDL-66893 mod_forum: move grade button into region main 2019-11-07 14:53:38 +08:00
Ryan Wyllie
69848e719b MDL-66893 mod_forum: add nested v2 support to grader 2019-11-07 14:53:38 +08:00
Ryan Wyllie
8404c2b101 MDL-66893 mod_forum: update grader search 2019-11-07 14:53:38 +08:00
Ryan Wyllie
8a09616bc2 MDL-66893 mod_forum: add grader status to grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
def5f14939 MDL-66893 mod_forum: update user picker in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
035bd996cb MDL-66893 mod_forum: show expand conversation in nested view 2019-11-07 14:53:37 +08:00
Ryan Wyllie
d9fedf3dc8 MDL-66893 mod_forum: update user content region in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
4c98e56c96 MDL-66893 mod_forum: update navigation bar in grader UI 2019-11-07 14:53:37 +08:00
Ryan Wyllie
46d51c8ca9 MDL-66893 mod_forum: update grading panel UI in grader 2019-11-07 14:53:37 +08:00
Jun Pataleta
ae05752048 Merge branch 'MDL-66372' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-11-07 13:22:32 +08:00
Michael Hawkins
cf8393be4b MDL-66372 forumreport_summary: Tidy up per page and bulk ops handling 2019-11-07 12:58:02 +08:00
Michael Hawkins
20b064beb0 MDL-66372 forumreport_summary: Added ability to select pagination size
This also includes some refactoring of the bulk actions menu, so both
elements are correctly position within the page, as well as fixing the
alignment of the bulk dropdown with the download dropdown.
2019-11-07 12:58:02 +08:00
Michael Hawkins
d418bda8c7 MDL-66372 forumreport_summary: Improved generate with filters override
Previously this override simply appended any GET params from the
action it was overriding to the final action URL, now it can handle
overriding param values, so that they are updated or added as needed
2019-11-07 12:58:02 +08:00
Michael Hawkins
0d8cd4af31 MDL-66372 forumreport_summary: Report template cleanup 2019-11-07 12:58:02 +08:00
Adrian Greeve
d5e303f8e3 Merge branch 'MDL-67057-master' of git://github.com/andrewnicols/moodle 2019-11-07 11:59:00 +08:00
Andrew Nicols
1c66ef98ed MDL-67057 h5p: Set framework file when saving package 2019-11-07 11:56:12 +08:00
Andrew Nicols
5730749f5d Merge branch 'MDL-66359-master' of git://github.com/Chocolate-lightning/moodle_forum-project 2019-11-07 10:48:33 +08:00
Mathew May
546bf3c68e MDL-66359 mod_forum: Restrict grader by groups 2019-11-07 10:47:45 +08:00
Mathew May
e3bb3da406 MDL-66359 core_course: Modify get_enrolled_users_by_cmid
We need to also provide a user's group along with the current information
2019-11-07 10:47:45 +08:00
Jun Pataleta
a65873c37d Merge branch 'MDL-66592_master' of git://github.com/dmonllao/moodle 2019-11-07 10:35:21 +08:00
Adrian Greeve
634485c56f Merge branch 'MDL-66890-master' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-11-07 10:08:54 +08:00
Andrew Nicols
6f44f09495 Merge branch 'MDL-67076-master' of git://github.com/sarjona/moodle 2019-11-07 09:44:35 +08:00
Andrew Nicols
7edf0138fb MDL-67057 h5p: Language string fix 2019-11-07 09:37:27 +08:00
Andrew Nicols
884ba60a50 Merge branch 'MDL-67057-master' of git://github.com/andrewnicols/moodle 2019-11-07 09:20:27 +08:00
Andrew Nicols
021c180c83 MDL-67057 h5p: Remove unreachable code 2019-11-07 09:13:25 +08:00
Mihail Geshoski
6ac0f57073 MDL-66762 tool_dataprivacy: Sanitize the extra fields in the webservice 2019-11-07 09:00:19 +08:00