Commit Graph

89847 Commits

Author SHA1 Message Date
Marina Glancy 69e89f4a82 MDL-60390 tool_messageinboud: not strict index comparision
This is something that changed in the upgraded Horde library. structure->findBody() returns string but structure->contentTypeMap is indexed with ints
2017-10-26 12:44:51 +08:00
Andrew Nicols b799cde890 Merge branch 'wip-MDL-60104-m34' of git://github.com/amygroshek/moodle 2017-10-26 11:32:54 +08:00
Andrew Nicols 9fd91f8eec Merge branch 'master-MDL-51892' of https://github.com/fwsl/moodle 2017-10-26 11:08:50 +08:00
Jake Dallimore 6e186498fd Merge branch 'MDL-59686-master' of git://github.com/lameze/moodle 2017-10-26 10:16:21 +08:00
Simey Lameze 3c2b703e00 MDL-59686 form: fix autosave support for editor field 2017-10-26 09:03:31 +08:00
Adrian Greeve e6ccfad242 MDL-57055 mod_label: Add label administration for boost.
This patch adds the label adminstration settings to the
label edit page.
2017-10-26 08:41:33 +08:00
Jun Pataleta 75909e3c92 Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle 2017-10-26 11:22:30 +13:00
Jun Pataleta 2a1f7a4442 Merge branch 'MDL-60571-manualgrading-savegotonextpage-styled' of https://github.com/lucaboesch/moodle 2017-10-26 10:02:27 +13:00
David Monllao 7851132177 Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:16:21 +02:00
David Monllao 4f7a80341e Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:14:54 +02:00
David Monllao 3b4e9a9fc8 Merge branch 'wip_MDL-60250_master' of git://github.com/gjb2048/moodle 2017-10-25 15:12:23 +02:00
David Monllao 507335e2de Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle 2017-10-25 15:08:49 +02:00
David Monllao 5b93dc8539 Merge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:06:49 +02:00
David Monllao 3a89d0b541 MDL-60434 analytics: Analysables lazy loading 2017-10-25 14:16:35 +02:00
David Monllao cc4d7ce61b MDL-60434 analytics: Missing dependency
Sneaking it in...
2017-10-25 14:13:53 +02:00
David Monllao b8bb8fe8de MDL-60434 analytics: Remove legacy is_valid method
This method was used when the API was tied to students at risk model,
this method does not make sense any more as it is up to each target
to define what is a valid course.
2017-10-25 12:47:12 +02:00
David Monllao d12e409784 Moodle release 3.4beta v3.4.0-beta 2017-10-25 11:14:22 +02:00
David Monllao b34460c669 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-10-25 11:14:20 +02:00
Damyon Wiese a66de3ca70 MDL-59909 calendar: Try hard not to fail the adhoc task.
Triggering a fatal error in an adhoc task is bad. It will be retried indefinitely.
Even though we are not sure how to get a module instance without a course module record,
it is possible and should not kill the Moodle site.
2017-10-25 15:42:14 +08:00
Marina Glancy 13e7626834 MDL-60569 registration: fix bug with showing email in the form 2017-10-25 15:12:43 +08:00
Mihail Geshoski 6a633d36c2 MDL-60430 assignment: Assignment save and show next for 1 user 2017-10-25 14:18:16 +08:00
Andrew Nicols 2600f32927 Merge branch 'MDL-60506-master-fix1' of git://github.com/lameze/moodle 2017-10-25 12:45:56 +08:00
Andrew Nicols 8ef00034f5 Merge branch 'MDL-36580' of https://github.com/stronk7/moodle 2017-10-25 12:45:55 +08:00
Jake Dallimore 19fa690c3f MDL-60429 calendar: fix for updating event course and group
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
2017-10-25 12:45:54 +08:00
Jake Dallimore e3a247849b Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle 2017-10-25 12:45:53 +08:00
Jake Dallimore c00e73dfe0 Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle 2017-10-25 12:45:52 +08:00
Jake Dallimore bbb9e17133 Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle 2017-10-25 12:45:52 +08:00
Andrew Nicols 6ee00de11b Merge branch 'MDL-36580' of https://github.com/stronk7/moodle 2017-10-25 12:45:51 +08:00
Damyon Wiese 7b18365be7 MDL-60458 javascript: MathJax Workaround
Mathjax currently has a bug in an upstream library that is incorrectly
loading 'process' because it things it's running under Node.js.

We don't load modules by shortname - so it should be fine to map process to
something else.

Because of the syntax they used we need to map it to something that is already loaded
and evaluates to null (Their code will then assume the module could not be loaded and continue).

We have a handy module that is guaranteed to be loaded first and evaluates to null -> core/first.

We should remove this workaround when MathJax releases a fixed version on their CDN and update the docs.
2017-10-25 12:30:21 +08:00
Damyon Wiese 89ceede3bf MDL-60458 Mathjax: Restore the accessible config
Undo the changes to the accessible config that were introduced by the previous library upgrade.
2017-10-25 12:30:14 +08:00
Mark Nelson 8e85371800 MDL-60564 calendar: removed duplication of exporter properties 2017-10-25 12:06:26 +08:00
Marina Glancy 786d9cd3a1 MDL-60543 env: Moodle 3.2 and 3.3 do no support PHP7.2 2017-10-25 09:02:22 +08:00
Mihail Geshoski 994ccb7845 MDL-60538 lesson: check if max attempts exceeded, use new lang string 2017-10-25 09:00:20 +08:00
Eloy Lafuente (stronk7) 984470d8a1 MDL-36580 backup: Avoid PHP notice restoring old backups
Before this implementation, both resourcekey and password
were not being included in the backups, so old backups are
missing them. To keep upwards compatibility and avoid a PHP
Notice (undefined property), existence is checked via isset(),
that is the usual way all over the restore process.
2017-10-24 22:49:10 +02:00
Tim Hunt c282157fc3 MDL-60162 quiz reports: refactor duplicated code into the base class
This is needed to fix the unit test in the last commit.
2017-10-24 18:06:46 +01:00
Tim Hunt ff456b59ea MDL-60162 quiz reports: too many rows fetched on download
This happened if one user had multiple enrolments in a course, and was
quite inefficient.
2017-10-24 18:06:44 +01:00
AMOS bot 809babbbd4 Automatically generated installer lang files 2017-10-25 00:05:34 +08:00
Amy Groshek 88924ff772 MDL-60104 mod_scorm: Fix scorm description display overflow 2017-10-24 10:42:23 -05:00
Luca Bösch 57f4e9608d MDL-60535 quiz: question bank button styled 2017-10-24 16:08:17 +01:00
Luca Bösch 1003e7e57e MDL-60571 quiz: Manual grading Save and go to next page button styled 2017-10-24 12:11:51 +01:00
Mark Nelson 429f78412d MDL-60564 calendar: removed unnecessary get_new_event_button() 2017-10-24 17:49:28 +08:00
Mark Nelson d2065abd0b MDL-60564 calendar: removed unnecessary get_course_filter_selector() 2017-10-24 17:49:26 +08:00
Grzegorz Ziółek 5fd7c11d17 MDL-51892 logging: Proper description of login errors. 2017-10-24 11:00:05 +02:00
Andrew Nicols acd146fe7c MDL-59938 calendar: Only show repeat information if repeating event 2017-10-24 16:00:36 +08:00
Andrew Nicols 79dff18711 MDL-59942 calendar: Add missing attribute to narrow day link 2017-10-24 15:35:31 +08:00
Andrew Nicols 9da0be8c46 MDL-60559 calendar: Upcoming block should respect type filter 2017-10-24 15:25:34 +08:00
Simey Lameze 6428642adb MDL-60429 calendar: update group and course id for repeated events 2017-10-24 13:46:40 +08:00
Andrew Nicols 349d379616 MDL-60561 calendar: Increase event limit for calendar
It's quite common to have more than 50 events in a calendar month, but
we do not want to change the default value when the API is called in
other ways.
2017-10-24 13:31:05 +08:00
Simey Lameze 7a963e924c MDL-60506 enrol: remove unwanted hidden elements 2017-10-24 13:18:58 +08:00
Mark Nelson 05ce018002 MDL-60545 core_calendar: ensure 'All courses' shows accurate data 2017-10-24 13:17:14 +08:00