100811 Commits

Author SHA1 Message Date
Luca Bösch
7dd58aac64 MDL-60331 questions: prevent double escaping question categories. 2021-04-28 17:30:46 +02:00
Sara Arjona
a5f0b354e7 weekly release 4.0dev 2021-04-27 15:14:50 +02:00
Sara Arjona
5bf03b02b1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2021-04-27 15:14:48 +02:00
Jun Pataleta
11df82e9f7 Merge branch 'MDL-71410-master' of git://github.com/rezaies/moodle 2021-04-27 12:36:24 +08:00
Shamim Rezaie
4ddc9fe0f4 MDL-71410 core: Prevent recursively calling getters 2021-04-27 14:32:26 +10:00
Shamim Rezaie
796e82124f MDL-71410 mod_quiz: implement activity_dates for the quiz module 2021-04-27 14:32:26 +10:00
Shamim Rezaie
ec519a6488 MDL-71410 mod_quiz: Cache quiz times in modinfo for performance
We update the dates with user/group overrides. The calculation of
the override in the quiz module is different from the assignment
module as the quiz_overrides table des not have a sortorder column.
See quiz_update_effective_access().
2021-04-27 14:32:26 +10:00
Shamim Rezaie
d61f18433f MDL-71410 mod_quiz: Cache user and group overrides 2021-04-27 14:32:26 +10:00
Shamim Rezaie
660f7c08c5 MDL-71410 mod_lesson: implement activity_dates for the lesson module 2021-04-27 14:32:26 +10:00
Shamim Rezaie
8a308c498c MDL-71410 mod_lesson: Cache lesson times in modinfo for performance
We update the dates with user/group overrides. The calculation of
the override in the lesson module is different from the assignment
module as the lesson_overrides table des not have a sortorder column.
See lesson::update_effective_access().
2021-04-27 14:01:49 +10:00
Shamim Rezaie
47fcfa0af8 MDL-71410 mod_lesson: Cache user and group overrides 2021-04-27 14:01:45 +10:00
Shamim Rezaie
18efd91d2f MDL-71410 mod_assign: implement activity_dates for the assignment module 2021-04-27 14:00:06 +10:00
Shamim Rezaie
4532d3f8b7 MDL-71410 mod_assign: Cache assign times in modinfo for performance
We update the dates with user/group overrides
2021-04-27 14:00:06 +10:00
Shamim Rezaie
8e50d64baf MDL-71410 mod_assign: Cache user and group overrides 2021-04-27 14:00:02 +10:00
Jun Pataleta
ce01d49e6b Merge branch 'MDL-71252-master' of git://github.com/HuongNV13/moodle 2021-04-27 10:41:03 +08:00
Huong Nguyen
5e7ff4b80c MDL-71252 completion: PHPUnit failure 2021-04-27 08:42:37 +07:00
Adrian Greeve
a8c614b2c1 Merge branch 'MDL-71329' of https://github.com/Chocolate-lightning/moodle 2021-04-27 09:36:56 +08:00
Víctor Déniz
54191ad718 Merge branch 'MDL-65687' of git://github.com/paulholden/moodle 2021-04-27 00:51:43 +01:00
Víctor Déniz
48a42f2289 Merge branch 'MDL-71003' of git://github.com/paulholden/moodle 2021-04-27 00:38:11 +01:00
Víctor Déniz
83ccf95c9e Merge branch 'MDL-71441-master' of git://github.com/bmbrands/moodle 2021-04-26 23:50:22 +01:00
Sara Arjona
57604e30ce Merge branch 'MDL-70917' of git://github.com/paulholden/moodle 2021-04-26 15:17:59 +02:00
Bas Brands
5941083d1d MDL-71441 core_user: add profilefield social to standard plugins list 2021-04-26 14:43:24 +02:00
Jun Pataleta
d9a8245efb MDL-71252 completion: Fix Behat test for manual completion display
Adjusting the test since the manual completion button is now being
hidden from the course homepage when completion is disabled.
2021-04-26 19:53:28 +08:00
Sara Arjona
6923ba4088 Merge branch 'MDL-71416' of git://github.com/paulholden/moodle 2021-04-26 12:35:34 +02:00
Sara Arjona
7046626952 Merge branch 'MDL-71392' of git://github.com/paulholden/moodle 2021-04-26 11:52:46 +02:00
Jun Pataleta
3dd247e869 Merge branch 'MDL-71252-master' of git://github.com/HuongNV13/moodle 2021-04-26 17:02:46 +08:00
Huong Nguyen
bda8e0fb2a MDL-71252 completion: Behat failure 2021-04-26 15:58:12 +07:00
Eloy Lafuente (stronk7)
5f9aa223b3 Merge branch 'MDL-70446-master' of https://github.com/sammarshallou/moodle 2021-04-26 10:44:59 +02:00
Jun Pataleta
93ab8c089e Merge branch 'MDL-71252-master' of git://github.com/HuongNV13/moodle 2021-04-26 15:55:11 +08:00
Sara Arjona
b8d4e8f251 Merge branch 'MDL-71370-master-test' of git://github.com/junpataleta/moodle 2021-04-26 09:50:40 +02:00
Huong Nguyen
3f9035b989 MDL-71252 completion: Avoid showing the 'Mark as done' button
The following activites will be applied:
 - Label
 - File (Force download/Open/In pop-up)
 - URL (Open/In pop-up)
2021-04-26 14:24:41 +07:00
Shamim Rezaie
14e37590bb MDL-71410 core: Introduce override_customdata()
The get_custom_data() method now calls obtain_dynamic_data() because
$this->customdata can be dynamic now.
2021-04-26 05:28:36 +10:00
Jun Pataleta
fca42002f7 MDL-71370 course: Make showcompletionconditions nullable
* When completion tracking is not enabled for the course, it does not
make sense for the course's showcompletionconditions setting to
be set according to the default value indicated by the
"moodlecourse | showcompletionconditions" admin setting. Setting
showcompletionconditions as enabled when completion tracking is disabled
makes even less sense. So in such a case, we should not be setting a
default value for showcompletionconditions and allow it to be null.

* When the course is edited and completion tracking is enabled, this
also would set the "Show completion conditions" field to default to the
value set in the "moodlecourse | showcompletionconditions" admin
setting.
2021-04-24 19:07:42 +08:00
AMOS bot
e55190e726 Automatically generated installer lang files 2021-04-24 00:07:56 +00:00
Paul Holden
8fa458eb3b MDL-71416 report_log: user context header should show users name.
Co-Authored-By: Luca Bösch <luca.boesch@bfh.ch>
2021-04-23 20:24:12 +01:00
Sara Arjona
12f64a02c9 Merge branch 'MDL-71144-master' of git://github.com/rezaies/moodle 2021-04-23 13:16:01 +02:00
Sara Arjona
146a38dc45 weekly release 4.0dev 2021-04-23 10:46:53 +02:00
Sara Arjona
a080f64c01 NOBUG: Fixed SVG browser compatibility 2021-04-23 10:46:51 +02:00
Mathew May
54b57cb7dc MDL-71329 tool_moodlenet: Check to see if we get errors before curl 2021-04-23 15:43:58 +08:00
Jun Pataleta
24a5f53086 Merge branch 'MDL-71171_master' of git://github.com/mdjnelson/moodle 2021-04-23 12:41:15 +08:00
Mark Nelson
5eb3d47403 MDL-71171 customfield_text: ensure we set defaults properly 2021-04-23 12:31:53 +08:00
abgreeve
ea362206a3 Merge branch 'MDL-70818-master-4' of git://github.com/rezaies/moodle 2021-04-23 12:19:51 +08:00
Andrew Nicols
db49294748 Merge branch 'MDL-70903-master' of git://github.com/roland04/moodle 2021-04-23 11:56:47 +08:00
Andrew Nicols
1a34066129 Merge branch 'master-MDL-71376' of https://github.com/rjnl/moodle 2021-04-23 11:52:21 +08:00
Shamim Rezaie
ac2b200a6e MDL-70818 mod_workshop: implement activity_dates for the workshop module 2021-04-23 13:46:28 +10:00
Shamim Rezaie
0b64b10eb9 MDL-70818 mod_workshop: cache workshop times in modinfo for performance 2021-04-23 13:46:28 +10:00
Shamim Rezaie
2ad16d8d9e MDL-70818 mod_scorm: implement activity_dates for the scorm module 2021-04-23 13:46:28 +10:00
Shamim Rezaie
31288bd1a6 MDL-70818 mod_forum: implement activity_dates for the forum module 2021-04-23 13:46:28 +10:00
Shamim Rezaie
b284e9e705 MDL-70818 mod_forum: cache forum times in modinfo for performance 2021-04-23 13:46:28 +10:00
Shamim Rezaie
b3b7c3f95a MDL-70818 mod_feedback: implement activity_dates for the feedback module 2021-04-23 13:46:28 +10:00