Commit graph

99818 commits

Author SHA1 Message Date
Andrew Nicols
803b2374aa Merge branch 'MDL-66932_M311' of https://github.com/nadavkav/moodle into MOODLE_311_STABLE 2021-02-03 10:21:44 +08:00
Andrew Nicols
a78d00b18c Merge branch 'MDL-68893-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE 2021-02-03 09:40:51 +08:00
Andrew Nicols
d1157ec971 Merge branch 'MDL-68958-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE 2021-02-03 09:35:11 +08:00
Andrew Nicols
4a14262695 Merge branch 'MDL-70339-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE 2021-02-03 09:08:49 +08:00
Andrew Nicols
fb537d0c39 Merge branch 'MDL-70583-cli-progress-MOODLE_311_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_311_STABLE 2021-02-03 08:28:17 +08:00
Brendan Heywood
52aac97590 MDL-70583 cli: Allow progress bars to be rendered in cli scripts 2021-02-02 22:07:53 +11:00
Sara Arjona
b6ea9f0d8c Merge branch 'MDL-70309-311' of git://github.com/ferranrecio/moodle into MOODLE_311_STABLE 2021-02-02 10:44:54 +01:00
Víctor Déniz
91cfc3ce08 Merge branch 'MDL-59782-311' of git://github.com/bmbrands/moodle into MOODLE_311_STABLE 2021-02-02 09:36:02 +00:00
Andrew Nicols
654a25c22f Merge branch 'MDL-70304-311' of git://github.com/ilyatregubov/moodle into MOODLE_311_STABLE 2021-02-02 15:32:13 +08:00
Sara Arjona
82a6dc6dd1 Merge branch 'MDL-70574_311' of https://github.com/timhunt/moodle into MOODLE_311_STABLE 2021-02-02 08:20:25 +01:00
Sara Arjona
a5304827cc Merge branch 'MDL-70288-311-2' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-02-02 07:59:36 +01:00
Ilya Tregubov
e1f6c22780 MDL-70304 core: updated adapter.js to 7.4.0 2021-02-02 08:59:09 +02:00
Jun Pataleta
868af1cb0b MDL-70288 qtype: 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 14:22:15 +08:00
Jun Pataleta
c7b0a60a3c 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 14:22:15 +08:00
Jun Pataleta
9730348163 MDL-70288 core: Remove duplicate labels for checkbox elements
* If there's a label, the text will serve as the description of  the
element.
2021-02-02 14:22:15 +08:00
Jun Pataleta
03d6acbb57 MDL-70288 theme_boost: Manage aria-describedby on form validation
* The aria-describedby attribute can be a list of element IDs that
describe the element. On form validation, the ID of the error message
container is added to this attribute which may already be containing
another ID. So we need to properly add/remove the error message ID
so that we don't delete any existing ID(s) in the aria-describedby
attribute during form validation.
2021-02-02 14:22:15 +08:00
Eloy Lafuente (stronk7)
de5a304746 Merge branch 'MDL-46256_311' of https://github.com/timhunt/moodle into MOODLE_311_STABLE 2021-02-01 23:20:11 +01:00
Eloy Lafuente (stronk7)
80cf455e48 Merge branch 'MDL-70648-311' of git://github.com/lameze/moodle into MOODLE_311_STABLE 2021-02-01 19:17:45 +01:00
Sara Arjona
7eab65170c Merge branch 'MDL-70625-311' of git://github.com/rezaies/moodle into MOODLE_311_STABLE 2021-02-01 15:37:02 +01:00
Sara Arjona
1706d90d02 Merge branch 'MDL-70734-311' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-02-01 12:30:13 +01:00
Sara Arjona
9db1e485ee Merge branch 'MDL-70740-311' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-02-01 11:25:12 +01:00
Andrew Nicols
5b51e88492 Merge branch 'MDL-58673-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-02-01 14:05:14 +08:00
Andrew Nicols
d5ff729197 MDL-70734 behat: Increase the WebDriver Curl timeout 2021-02-01 09:49:54 +08:00
Andrew Nicols
ac2e94f946 MDL-70740 behat: Composer bump for new version of Mink Driver 2021-01-31 20:26:35 +08:00
Luca Bösch
908f4ca718 MDL-68893 mod_data: use own RSS feed string.
AMOS BEGIN
 CPY [rsstype,core],[rsstype,mod_data]
AMOS END
2021-01-29 23:21:20 +01:00
Víctor Déniz
fb9419ec0b weekly release 3.11dev 2021-01-29 17:12:59 +00:00
Víctor Déniz
01af47f95d Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE 2021-01-29 17:12:54 +00:00
Jake Dallimore
1cca977486 Merge branch 'MDL-66979-311-7' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-01-29 15:43:14 +08:00
Andrew Nicols
5a706a506c MDL-66979 behat: Mark some tests as being slow
Uses of the httpsreplace and customlang tools are known to be extremely
slow.

In our CI infrastructure on slwoer DBs, the customlang tool can take
over 90 seconds to load the page, whilst the httpsreplace tool can take
up to about 60 seconds.

These changes set appropriate timeout factors to increase the timeout
accordingly.
2021-01-29 14:18:51 +08:00
Andrew Nicols
3d89a661df MDL-66979 behat: Add a step to set a timeout factor for a test 2021-01-29 14:18:51 +08:00
Eloy Lafuente (stronk7)
909f1d7203 MDL-66979 behat: Goutte driver doesn't implement setTimeouts()
Also, change:

get_real_timeout(30000)

to:

get_real_timeout(30) * 1000

because the original functions are defined to use seconds, and
having the 1000 around will help us detecting cases in the case
of a hypothetical review of uses.
2021-01-29 14:18:45 +08:00
AMOS bot
39e785e4b0 Automatically generated installer lang files 2021-01-29 00:07:30 +00:00
Eloy Lafuente (stronk7)
01fd844e94 MDL-66979 behat: Goutte driver doesn't implement setTimeouts()
Also, change:

get_real_timeout(30000)

to:

get_real_timeout(30) * 1000

because the original functions are defined to use seconds, and
having the 1000 around will help us detecting cases in the case
of a hypothetical review of uses.
2021-01-28 17:12:05 +01:00
Eloy Lafuente (stronk7)
dc7b085229 Merge branch 'MDL-66979-311-7' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-01-28 09:08:53 +01:00
Andrew Nicols
e631b8c5e1 MDL-66979 behat: Set script timeout with timeout factor 2021-01-28 15:27:49 +08:00
Andrew Nicols
ec9bb74405 MDL-66979 behat: Correct selenium2 reference in config-dist 2021-01-28 15:08:10 +08:00
Andrew Nicols
7cff15dc4d MDL-66979 behat: Handle driver stop failure properly
An case was found where the webdriver stop() call could fail in an
AfterScenario hook, leading to a complete rerun if no other errors were
experienced.
2021-01-28 15:07:52 +08:00
Jun Pataleta
67ddc3a9a2 Merge branch 'MDL-70444-dashboard-reset-progress-311' of https://github.com/Peterburnett/moodle into MOODLE_311_STABLE 2021-01-28 09:53:56 +08:00
Andrew Nicols
0911cc0b1e Merge branch 'MDL-70048-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE 2021-01-28 08:04:22 +08:00
Peter Dias
384d1874ac MDL-70048 dropbox: Augmented unit tests to account for additional params 2021-01-28 07:32:20 +08:00
Peter Dias
0cc373fca6 MDL-70048 dropbox: Update the dropbox search URL.
- Update fetch_dropbox_data to allow different result nodes and version
- Update search to the new URL with new params
- Update the get entities function to account for the change in structure.
2021-01-28 07:32:20 +08:00
Víctor Déniz
40f7439381 Merge branch 'MDL-69816-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-01-27 18:23:12 +00:00
Víctor Déniz
c1f4d038d4 Merge branch 'MDL-70585-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-01-27 10:21:00 +00:00
AMOS bot
8194b3151c Automatically generated installer lang files 2021-01-27 00:07:30 +00:00
Eloy Lafuente (stronk7)
cdb14d91f7 Merge branch 'MDL-66979-311-7' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-01-26 22:44:11 +01:00
Víctor Déniz
d3e82b7640 Merge branch 'MDL-70528-311' of git://github.com/ilyatregubov/moodle into MOODLE_311_STABLE 2021-01-26 14:05:22 +00:00
Ilya Tregubov
f283de3d3e MDL-70528 h5pactivity: Fix block can't be added to h5pactivity page. 2021-01-26 15:44:26 +02:00
Víctor Déniz
88bb658169 Merge branch 'MDL-65135-311' of https://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-01-25 15:06:00 +00:00
Peter Dias
9c08b2b8aa MDL-70339 mod_lti: Use the convenience function to get the right img 2021-01-25 13:39:02 +08:00
Peter Dias
4a6dfb94f2 MDL-68958 mod_imscp: Return manifestfilename as default response. 2021-01-25 13:23:15 +08:00