22364 Commits

Author SHA1 Message Date
Adrian Greeve
007c270507 Merge branch 'MDL-70755' of https://github.com/mkassaei/moodle 2021-02-11 10:54:38 +08:00
Adrian Greeve
e54ee9e512 Merge branch 'MDL-70773' of https://github.com/mkassaei/moodle 2021-02-11 10:19:39 +08:00
Adrian Greeve
f83156fcf9 Merge branch 'MDL-70513' of https://github.com/timhunt/moodle 2021-02-11 10:06:50 +08:00
Adrian Greeve
9cacb16c01 Merge branch 'MDL-69867-master_display_grade_with_scale' of git://github.com/moffe42/moodle 2021-02-11 09:23:50 +08:00
Sara Arjona
fd31854480 Merge branch 'MDL-70732-master' of git://github.com/aanabit/moodle 2021-02-10 17:20:22 +01:00
Jacob Christiansen
0770d9fec3 MDL-69867 mod_assign: Display current grade with scale value
When using workflow we show the current grade with its scale value
instead of the internal index
2021-02-10 08:13:05 +01:00
Adrian Greeve
407ed3ff33 Merge branch 'MDL-52420-master' of https://github.com/sharidas/moodle 2021-02-10 12:54:19 +08:00
Sara Arjona
68d39e634f Merge branch 'MDL-68736-master' of git://github.com/ferranrecio/moodle 2021-02-09 15:05:29 +01:00
Sara Arjona
1d6b734108 Merge branch 'MDL-70173-master' of git://github.com/rezaies/moodle 2021-02-09 08:29:13 +01:00
Shamim Rezaie
805df4f846 MDL-70173 theme_boost: Fix empty link issue on the "Go to top" button
On behat, we have to use a more specific test step if we are looking
for a "Go" button on a modal. The reason is that the html of the modal
content is put after the html of the "Go to top" button, so behat
may find the "Go to top" button if we just look for "Go".
2021-02-09 16:16:09 +11:00
Mahmoud Kassaei
d2f8ea2073 MDL-70719 quiz overrides: only show Actions column header if needed 2021-02-05 15:46:37 +00:00
Amaia Anabitarte
248d4ff200 MDL-70732 behat: Adding second parameter to ExpectationException() 2021-02-05 11:01:22 +01:00
Tim Hunt
f44bff98fb MDL-70513 quiz manual grading: use formchangechecker to avoid dataloss 2021-02-03 16:06:54 +00:00
Mahmoud Kassaei
32b645fd03 MDL-70773 Quiz overrides: User links don't point to user profile page 2021-02-03 11:47:23 +00:00
Sara Arjona
6d0b97a176 Merge branch 'MDL-67959-master-2' of git://github.com/junpataleta/moodle 2021-02-03 10:50:29 +01:00
Mahmoud Kassaei
b297faa4ab MDL-70755 Quiz overrides: Broken layout for Group overrides 2021-02-03 09:29:11 +00:00
Sara Arjona
a50802c68b Merge branch 'MDL-70621-master' of git://github.com/lucaboesch/moodle 2021-02-03 09:02:45 +01:00
Sara Arjona
4d5c3c3914 Merge branch 'MDL-68970' of https://github.com/timhunt/moodle 2021-02-03 08:51:11 +01:00
Luca Bösch
f37dbcc15b MDL-70621 mod_glossary: use glossary rsstype string. 2021-02-03 08:33:54 +01:00
Andrew Nicols
83c148971a Merge branch 'MDL-68893-master' of git://github.com/lucaboesch/moodle 2021-02-03 09:40:36 +08:00
Andrew Nicols
4364244970 Merge branch 'MDL-68958-master' of git://github.com/peterRd/moodle 2021-02-03 09:30:11 +08:00
Andrew Nicols
71b232e23a Merge branch 'MDL-70339-master' of git://github.com/peterRd/moodle 2021-02-03 08:54:31 +08:00
Víctor Déniz
35a0bec31a Merge branch 'MDL-59782-master' of git://github.com/bmbrands/moodle 2021-02-02 09:36:19 +00:00
Jun Pataleta
793aa03598 MDL-70288 mod_lti: Remove unnecessary empty label string
* When a label is passed to an (advanced) checkbox and no text
  was provided, the label will be displayed on the right of the the
  checkbox element. So there's no point in passing an empty string for
  the label just to render the text to the right of the checkbox.
2021-02-02 13:53:05 +08:00
Sujith Haridasan
a44dbf0894 MDL-52420 mod_assign: Save comment when save buttons are clicked
Save comment in the assignment when the Save changes
or Save and show next button are clicked at the bottom
of the page.

Signed-off-by: Sujith Haridasan <sujith@moodle.com>
2021-02-02 10:52:13 +05:30
Luca Bösch
55ab2bce55 MDL-70621 mod_forum: use forum rsstype string. 2021-01-29 23:43:37 +01:00
Luca Bösch
ac3a15c287 MDL-68893 mod_data: use own RSS feed string.
AMOS BEGIN
 CPY [rsstype,core],[rsstype,mod_data]
AMOS END
2021-01-29 23:43:18 +01:00
Jun Pataleta
cbee8815fc MDL-67959 mod_forum: Display group pictures in forum only if available
Displaying a default group picture in forum posts leads to confusion,
so better to not display a default group picture when the group
picture is not set for the group.
2021-01-29 12:29:29 +08:00
Bas Brands
12bc605457 MDL-59782 core_question: improve questionbank highlighting 2021-01-28 08:12:58 +01:00
Eloy Lafuente (stronk7)
938c018963 Merge branch 'MDL-66979-master-7' of git://github.com/andrewnicols/moodle 2021-01-26 22:43:54 +01:00
Víctor Déniz
abd55fac97 Merge branch 'MDL-70528-master' of git://github.com/ilyatregubov/moodle 2021-01-26 14:05:37 +00:00
Ilya Tregubov
7a77493ba5 MDL-70528 h5pactivity: Fix block can't be added to h5pactivity page. 2021-01-26 15:19:01 +02:00
Ferran Recio
734bf378a5 MDL-68736 h5pactivity: remove legacy log method 2021-01-26 11:15:57 +01:00
Tim Hunt
bdbe3cd268 MDL-68970 quiz: prevent page caching during attempts
This ensures that the page reloads if the student uses
the Back or Forwards buttons within an attempt. This
avoids questions being in a stale state, or
the timer showing the wrong time.

Thanks to Jake Dallimore and Russell Boyatt for suggestions
which lead to this fix.
2021-01-25 18:33:51 +00:00
Adrian Greeve
7e0c33b376 Merge branch 'master-MDL-69631-v3' of https://github.com/golenkovm/moodle 2021-01-25 08:15:36 +08:00
Andrew Nicols
fd5b398488 MDL-66979 mod_assign: Stop clicking the user filters
Remove the documented hack which was re-opening a popup because it
"closes for some reason". It no longer randomly closes.
2021-01-22 14:52:11 +08:00
Andrew Nicols
a61c4fbce3 MDL-66979 behat: Switch to generators
These steps were creating content manually in an unnecessary fashion. I
had to debug some issues with features in these areas so took the time
to update them to make use of data generators, which are significantly
faster.
2021-01-22 14:52:11 +08:00
Andrew Nicols
dd8d8c7ac2 MDL-66979 scorm: Increase behat window size
On Firefox there can be some issues with ensuring that all nodes are
visible in order to click them.

This is likely an upstream geckodriver bug and not one that can be
easily addressed across all of Moodle.

In this instance the "Next" button is just outside the Visible Window,
but it is in an iFrame which is fully visible. In this situation
Firefox is unable to click the button but does not error.
2021-01-22 14:52:10 +08:00
Andrew Nicols
2896d23776 MDL-66979 mod_data: Improve behat chart data step
Charts data visibility is more reliable when checked via the
aria-expanded attribute.

The isVisible attribute can cause some failures under Firefox.
2021-01-22 14:52:10 +08:00
Adrian Greeve
3f2462a5c7 Merge branch 'MDL-57020-master-allow_delete_unused_scale' of https://github.com/sharidas/moodle 2021-01-21 12:01:32 +08:00
Mikhail Golenkov
ddcd769e93 MDL-69631 assign: Add 'Draft' filter for grading table 2021-01-21 14:36:01 +11:00
Jun Pataleta
0d6ea0d604 Merge branch 'MDL-70562-master' of git://github.com/lucaboesch/moodle 2021-01-20 15:01:34 +08:00
Peter Dias
1e2e5ea0d3 MDL-70339 mod_lti: Use the convenience function to get the right img 2021-01-20 11:49:40 +08:00
Peter Dias
0e0d08ed1b MDL-68958 mod_imscp: Return manifestfilename as default response. 2021-01-20 09:51:44 +08:00
Adrian Perez
9e15569d48 MDL-69202 Restore backup: add getter method for oldmoduleid 2021-01-16 10:25:05 +01:00
Luca Bösch
0daf89a0e3 MDL-70562 mod_quiz: "Edit quiz" and "Back to the course" button spacing 2021-01-15 11:59:38 +01:00
Sujith Haridasan
7b3f43db95 MDL-57020 scales: Allow deletion of unused scales in forum
Allow deletion of unused scales used in a
forum for the course.

Signed-off-by: Sujith Haridasan <sujith@moodle.com>
2021-01-15 15:07:53 +05:30
Sara Arjona
7d24686e59 Merge branch 'MDL-69308' of https://github.com/stronk7/moodle 2021-01-14 12:03:30 +01:00
Jun Pataleta
adbebb3bcc Merge branch 'MDL-70312' of git://github.com/paulholden/moodle 2021-01-14 11:54:37 +08:00
Eloy Lafuente (stronk7)
e15aaed77a Merge branch 'MDL-70408-master' of git://github.com/sarjona/moodle 2021-01-13 23:59:36 +01:00