Commit graph

23894 commits

Author SHA1 Message Date
Víctor Déniz
f7dd6b26b7 Merge branch 'MDL-71118-master' of git://github.com/lucaboesch/moodle 2021-04-19 19:43:32 +01:00
Eloy Lafuente (stronk7)
973a4a2ae1 Merge branch 'MDL-71181-master' of https://github.com/ettolrah/moodle 2021-04-19 18:58:14 +02:00
Dongsheng Cai
a42df81709 MDL-68747 mod_quiz: force LTR for quiz grading overview chart 2021-04-19 21:06:04 +10:00
Paul Holden
4b3f22e5d1 MDL-71127 mod_quiz: fix thrown exception for invalid question columns. 2021-04-19 09:06:56 +01:00
Luca Bösch
aee27d0a9b MDL-71118 core: Add grade (verb) string.
AMOS BEGIN
 CPY [grade,core],[gradenoun,core]
 CPY [grade,core],[gradeverb,core]
AMOS END
2021-04-17 11:46:09 +02:00
Eloy Lafuente (stronk7)
fc2e04d903 Merge branch 'MDL-71334-master' of git://github.com/mickhawkins/moodle 2021-04-16 19:59:37 +02:00
Jake Dallimore
64e24894f4 Merge branch 'master' of git://github.com/paulphillip5/moodle 2021-04-16 07:57:01 +01:00
Michael Hawkins
7ffc5a7160 MDL-71334 mod_lti: Fix manual activity completion behat test 2021-04-16 14:09:55 +08:00
Sara Arjona
e82e8b4b1c Merge branch 'MDL-71337-master' of git://github.com/junpataleta/moodle 2021-04-15 08:30:08 +02:00
Jun Pataleta
18ad675111 MDL-71337 mod_h5pactivity: Increase window size during test
The addition of the activity information moves the h5p content down
out of the window view on Firefox which causes the Check button to be
unclickable. This patch increases the window size to ensure that the
check button is visible and clickable.

Credits to Eloy <stronk7@moodle.org> for the thorough investigation
of the root cause of this issue :)
2021-04-15 12:44:31 +08:00
Paul Holden
16eefb1444 MDL-70772 mod_forum: check for valid usernode before making active. 2021-04-14 09:20:02 +01:00
Andrew Nicols
c10791cab9 Merge branch 'MDL-71169-master-execute' of git://github.com/mudrd8mz/moodle 2021-04-14 08:35:07 +08:00
Luca Bösch
37a1f2454a MDL-69874 workshop: Title mentions received assessments in close phase. 2021-04-13 11:52:36 +02:00
Adrian Greeve
83b71194cd Merge branch 'MDL-71161-master-4' of git://github.com/junpataleta/moodle 2021-04-13 11:42:30 +08:00
Eloy Lafuente (stronk7)
6e39487123 Merge branch 'mdl_71172' of https://github.com/AnupamaSarjoshi/moodle 2021-04-13 00:46:55 +02:00
Michael Hawkins
09a59a75c6 MDL-71161 mod_workshop: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
907ce56d20 MDL-71161 mod_wiki: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
f37c83da8d MDL-71161 mod_url: Display activity completion information 2021-04-13 01:21:12 +08:00
Simey Lameze
59249a54c9 MDL-71161 mod_survey: show survey activity info 2021-04-13 01:21:12 +08:00
Michael Hawkins
920646237d MDL-71161 mod_scorm: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
1a596574ba MDL-71161 mod_resource: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
a219b812b4 MDL-71161 mod_quiz: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
c8a6d12608 MDL-71161 mod_page: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
e3fb51e3c8 MDL-71161 mod_lti: Display activity completion information 2021-04-13 01:21:12 +08:00
Michael Hawkins
8395543c40 MDL-71161 mod_lesson: Display activity completion information 2021-04-13 01:21:12 +08:00
Jun Pataleta
23cb701a75 MDL-71161 mod_imscp: Display activity information output component 2021-04-13 01:21:12 +08:00
Jun Pataleta
16a9e8ada7 MDL-71161 mod_h5pactivity: Display activity information output component 2021-04-13 01:21:12 +08:00
Simey Lameze
1e459102e4 MDL-71161 mod_glossary: show glossary activity info 2021-04-13 01:21:12 +08:00
Simey Lameze
3e228db3bf MDL-71161 mod_forum: show forum activity info 2021-04-13 01:21:11 +08:00
Jun Pataleta
10ed7500fb MDL-71161 mod_folder: Display activity information output component 2021-04-13 01:21:11 +08:00
Simey Lameze
52b9a0c920 MDL-71161 mod_feedback: show feedback activity info 2021-04-13 01:21:11 +08:00
Simey Lameze
a45eca85bb MDL-71161 mod_data: show database activity info 2021-04-13 01:21:11 +08:00
Jun Pataleta
0ba0dfe3a9 MDL-71161 mod_chat: Display activity information output component 2021-04-13 01:21:11 +08:00
Jun Pataleta
6b46ce4c48 MDL-71161 mod_book: Display activity information output component 2021-04-13 01:21:11 +08:00
Simey Lameze
8d38fc7eab MDL-71161 mod_assign: show assign activity info 2021-04-13 01:21:11 +08:00
Sara Arjona
4a45b3f8ef Merge branch 'MDL-68716' of git://github.com/paulholden/moodle 2021-04-12 17:24:33 +02:00
Anupama Sarjoshi
c4fa89d55a MDL-71172 quiz: Improve quiz Behat tests 2021-04-12 11:31:44 +01:00
Adrian Greeve
d24df2a201 Merge branch 'MDL-70821-master-5' of git://github.com/junpataleta/moodle 2021-04-12 14:45:59 +08:00
Jun Pataleta
1c15796a75 MDL-70821 behat: Use new activity completion steps for Behat tests
Replace usages of completion Behat steps that check for the completion
checkboxes with the new activity completion Behat steps.
2021-04-12 11:41:37 +08:00
Eloy Lafuente (stronk7)
c33b5efaad Merge branch 'master_MDL-32226' of https://github.com/danmarsden/moodle 2021-04-08 17:30:12 +02:00
Adrian Greeve
1145cf4659 Merge branch 'MDL-70935-master-4' of git://github.com/mickhawkins/moodle 2021-04-07 15:41:04 +08:00
Shamim Rezaie
a75861f78e MDL-70935 mod_quiz: Custom completion implementation 2021-04-07 15:09:36 +08:00
Shamim Rezaie
7a9f13e37f MDL-70935 mod_quiz: combine 'pass' and 'attemptsexhausted' rules
Custom rules are combined using the AND operator. However, the
'completionpass' and 'completionattemptsexhausted' rules are exceptions
because they are combined together with OR, and form a single new rule
that then will be combined with the rest of the rules using AND.
This commit combines the mentioned rules into a single rule named
'completionpassorattemptsexhausted'.
2021-04-07 15:09:36 +08:00
Shamim Rezaie
24b9ff4c71 MDL-70935 mod_quiz: Missing completionminattempts rule description
The mod_quiz_get_completion_active_rule_descriptions() function was not
returning the description for the 'completionminattempts' rule. Added
that.
2021-04-07 15:09:36 +08:00
Michael Hawkins
663b273a55 MDL-70935 mod_scorm: Custom completion implementation 2021-04-07 15:09:36 +08:00
Michael Hawkins
f85b36edc5 MDL-70935 mod_lesson: Custom completion implementation 2021-04-07 15:09:36 +08:00
Adrian Greeve
7ef3653b65 Merge branch 'MDL-70820-master' of git://github.com/lameze/moodle 2021-04-07 13:26:12 +08:00
Simey Lameze
7c7c1aafc8 MDL-70820 mod_forum: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
d8e2ca0aae MDL-70820 mod_glossary: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
c8cb54f15a MDL-70820 mod_assign: custom completion implementation 2021-04-07 12:17:30 +08:00