Michael Hawkins
34d6916968
MDL-72629 timeline: Reduce footprint when a course has no events
...
This also improves the noevents string so it makes sense in all
contexts.
2021-10-07 14:22:12 +08:00
Shamim Rezaie
e37c5b1ef3
Merge branch 'MDL-71938-master' of git://github.com/HuongNV13/moodle
2021-10-07 17:05:11 +11:00
Ilya Tregubov
b4675942ce
Merge branch 'MDL-52206-master-rebased' of git://github.com/peterRd/moodle
2021-10-07 12:55:12 +07:00
abgreeve
ea086c3cde
Merge branch 'MDL-72277-master' of https://github.com/dcai/moodle
2021-10-07 13:39:45 +08:00
hiendinh
e255952011
MDL-71938 tool_usertours: New "Display step numbers" setting
...
Co-authored-by: Huong Nguyen <huongnv13@gmail.com>
2021-10-07 10:53:40 +07:00
Dongsheng Cai
43e5cc11b5
MDL-72277 block_timeline: UI improvements
2021-10-07 14:49:51 +11:00
Shamim Rezaie
5f2963b053
MDL-72517 qformat: Removed extra whitespaces
2021-10-07 13:28:00 +11:00
Peter
7a9e3db9dc
MDL-52206 completion: Behat test
...
Co-authored-by: aanabit
2021-10-07 10:17:25 +08:00
Shamim Rezaie
6e2f35ae18
Merge branch 'MDL-72517-master' of git://github.com/cescobedo/moodle
2021-10-07 13:03:06 +11:00
Jun Pataleta
d9f53b70be
Merge branch 'MDL-70874-master_take2' of git://github.com/lucaboesch/moodle
2021-10-06 22:49:03 +08:00
Jun Pataleta
87a5419f6f
Merge branch 'MDL-72339-master' of https://github.com/sammarshallou/moodle
2021-10-06 22:44:40 +08:00
Luca Bösch
aead4ba45a
MDL-70874 gradereport_user: Add colors and icon distinguishing pass/fail
2021-10-06 16:36:12 +02:00
sam marshall
4dd7f2ac54
MDL-72339 core_availability: Unsafe to use format_string in description
...
The availability condition get_description method is called while
gathering data for the modinfo object. As such it is not safe to
call other functions which might rely on modinfo, such as format_string
(if using filters which access modinfo).
This change provides a mechanism to call format_string later, and also
a general callback to do other stuff later as well if needed. It uses
the same approach already taken to make activity names work correctly
in the availability_condition class.
2021-10-06 11:28:26 +01:00
Jun Pataleta
6f7e5cf2ce
Merge branch 'MDL-72557-master' of git://github.com/rezaies/moodle
2021-10-06 18:20:04 +08:00
cescobedo
678826efb8
MDL-72517 qformat: Remove ExamView question format
2021-10-06 09:35:35 +02:00
Ilya Tregubov
af94d5b09c
Merge branch 'MDL-72662' of git://github.com/paulholden/moodle
2021-10-06 14:01:21 +07:00
Andrew Nicols
d6f4f27bc6
Merge branch 'MDL-72515-master' of git://github.com/marinaglancy/moodle
2021-10-06 12:55:03 +08:00
Ilya Tregubov
2924d7c496
Merge branch 'MDL-72452-resource-filter' of https://github.com/Peterburnett/moodle
2021-10-06 10:53:55 +07:00
Jake Dallimore
3c7e486205
Merge branch 'MDL-72094-master' of git://github.com/mihailges/moodle
2021-10-06 10:51:29 +08:00
Andrew Nicols
7c357c22a1
Merge branch 'MDL-71707' of https://github.com/paulholden/moodle
2021-10-06 09:15:31 +08:00
Andrew Nicols
d26bd7c078
Merge branch 'MDL-72599' of git://github.com/paulholden/moodle
2021-10-06 09:11:58 +08:00
Eloy Lafuente (stronk7)
70073fdc74
on-demand release 4.0dev+
2021-10-06 00:25:03 +02:00
Víctor Déniz
98804a0e5e
Merge branch 'MDL-71963' of https://github.com/stronk7/moodle
2021-10-05 23:20:41 +02:00
Andrew Nicols
fa72197258
MDL-72463 courseformat: Add missing docs
2021-10-05 23:20:41 +02:00
Eloy Lafuente (stronk7)
ba84d525eb
MDL-71963 behat: Let's search for blocks, not for strings
...
In classic, the "Search forums" string still was around (in the
"Add a block" block). So, instead of searching for strings, we
use the explicit step that allows us to look for blocks.
2021-10-05 23:20:41 +02:00
Andrew Nicols
b7687bfef8
Merge branch 'MDL-72463-master' of git://github.com/ferranrecio/moodle
2021-10-05 23:20:41 +02:00
Andrew Nicols
3868d359ba
Merge branch 'MDL-72407-master' of git://github.com/sarjona/moodle
2021-10-05 23:20:41 +02:00
Shamim Rezaie
b472f96311
Merge branch 'MDL-72500' of git://github.com/paulholden/moodle
2021-10-05 23:20:41 +02:00
Andrew Nicols
f013a60bed
Merge branch 'MDL-72326' of https://github.com/NeillM/moodle
2021-10-05 23:20:41 +02:00
Andrew Nicols
3482a5494b
Merge branch 'MDL-72347-master' of git://github.com/sarjona/moodle
2021-10-05 23:20:38 +02:00
Andrew Nicols
04ff28f00c
Merge branch 'MDL-72348-master' of git://github.com/sarjona/moodle
2021-10-05 23:18:51 +02:00
Ilya Tregubov
a4a59a4a74
Merge branch 'MDL-72455-master' of git://github.com/bmbrands/moodle
2021-10-05 23:18:51 +02:00
Ilya Tregubov
85c1947840
Merge branch 'MDL-56773-master' of git://github.com/rezaies/moodle
2021-10-05 23:18:51 +02:00
Andrew Nicols
598f3c2cc3
Merge branch 'MDL-72642-master' of git://github.com/mihailges/moodle
2021-10-05 23:18:51 +02:00
Jun Pataleta
98f437d16d
Merge branch 'MDL-39324-master' of https://github.com/kiratskitizing/moodle
2021-10-05 23:18:51 +02:00
Víctor Déniz
311163bd9b
Merge branch 'MDL-72597' of git://github.com/paulholden/moodle
2021-10-05 23:18:51 +02:00
Andrew Nicols
df2af96ffa
Merge branch 'MDL-72707' of https://github.com/stronk7/moodle
2021-10-05 23:18:50 +02:00
Víctor Déniz
55c3cf3870
Merge branch 'MDL-72691_Open_popup_fix_after_ajax_reload' of git://github.com/lostrogit/moodle
2021-10-05 23:18:50 +02:00
Eloy Lafuente (stronk7)
f6a023d301
Merge branch 'MDL-72276' of https://github.com/vmdef/moodle
2021-10-05 23:18:50 +02:00
Andrew Nicols
0310b76642
MDL-71963 js: Address lint issues in integration
2021-10-05 23:18:50 +02:00
Andrew Nicols
89457e9acb
Merge branch 'MDL-71963-master' of https://github.com/Chocolate-lightning/moodle
2021-10-05 23:18:50 +02:00
Víctor Déniz
48b5d50200
MDL-72276 block_timeline: behat scenario update after aria label change
2021-10-05 23:18:47 +02:00
Ilya Tregubov
40e4f5fc6b
Merge branch 'MDL-72395' of https://github.com/stronk7/moodle
2021-10-05 23:18:47 +02:00
Víctor Déniz
2957711cd5
Merge branch 'MDL-72276-master' of git://github.com/junpataleta/moodle
2021-10-05 23:18:47 +02:00
Ilya Tregubov
e560a4becc
Merge branch 'master_MDL-71679-mod_quiz-52' of https://github.com/catalyst/moodle-MDL-70329
2021-10-05 23:18:47 +02:00
Andrew Nicols
8b7fb0f7ab
Merge branch 'MDL-71795-master' of git://github.com/ferranrecio/moodle
2021-10-05 23:18:46 +02:00
Paul Holden
968b872c9d
MDL-71707 libraries: upgrade to version 3.3.0 of Spout.
2021-10-05 08:04:47 +01:00
Carlos Castillo
a9f45b0842
MDL-72691 reportbuilder: Encode popup data inside report actions.
...
Encode all popup data for report actions inside the action link
itself, because previously reloading a report via AJAX meant
actions no longer opened in popups, because the required JS was
absent from the page.
2021-10-04 09:59:42 -05:00
Paul Holden
fe53a6262f
MDL-72597 course: use formatted course module name in context header.
2021-10-04 14:19:58 +01:00
Neill Magill
377c618083
MDL-72326 grunt: Fix component library grunt on Windows
...
Before this change grunt tried to use the Linux version of files in
node_modules/.bin rather than the Windows version which is generated
by npm.
To avoid this issue we need to run the components directly.
2021-10-04 13:18:08 +01:00