94509 Commits

Author SHA1 Message Date
Adrian Greeve
2217ca91ee Merge branch 'MDL-57623' of git://github.com/Chocolate-lightning/moodle 2019-08-13 14:27:30 +08:00
Mathew May
09dedee2e1 MDL-57623 behat: Remove deprecated step from 3.3 2019-08-13 14:24:34 +08:00
Jun Pataleta
29c5579db9 Merge branch 'MDL-62034-master' of git://github.com/andrewnicols/moodle 2019-08-13 14:20:42 +08:00
Andrew Nicols
24d2a49e21 MDL-62034 assign: Add hint for user tour reset 2019-08-13 14:12:29 +08:00
Andrew Nicols
c188ddfe93 Merge branch 'MDL-59524-master' of git://github.com/cescobedo/moodle 2019-08-13 12:56:32 +08:00
Adrian Greeve
5918473134 Merge branch 'MDL-66008-master-fix' of https://github.com/lameze/moodle 2019-08-13 10:27:31 +08:00
Simey Lameze
4d98566939 MDL-66008 core_calendar: fix behat failures 2019-08-13 09:50:48 +08:00
Jun Pataleta
1946261fb3 Merge branch 'MDL-66288-master' of git://github.com/lameze/moodle 2019-08-12 15:15:14 +08:00
Andrew Nicols
92afad61ae Merge branch 'MDL-65937-master' of git://github.com/junpataleta/moodle 2019-08-12 14:54:20 +08:00
Jun Pataleta
a7faa3f1c5 Merge branch 'MDL-66104' of git://github.com/stronk7/moodle 2019-08-12 14:51:59 +08:00
Simey Lameze
bcd0583e68 MDL-66008 calendar: Remove duplicated call to library funciton
A duplicated call to calendar_get_allowed_event_types has
been removed.
2019-08-12 14:49:40 +08:00
Simey Lameze
e4b1c14a37 MDL-66288 dataformat: prettify exported JSON data 2019-08-12 07:29:31 +08:00
cescobedo
0504254f1d MDL-59524 general: Remove strings deprecated in 3.4 2019-08-12 00:13:08 +02:00
Jun Pataleta
8e9e9a5f7e weekly release 3.8dev 2019-08-09 16:23:53 +08:00
Jun Pataleta
e2e7fdb4df Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-08-09 16:23:51 +08:00
Jun Pataleta
a6489fabbf Merge branch 'MDL-65679-master-fix' of git://github.com/andrewnicols/moodle 2019-08-09 11:38:59 +08:00
Andrew Nicols
7be52eb255 MDL-65679 assignfeedback_editpdf: Adjust z-indexes for editpdf 2019-08-09 08:34:29 +08:00
Jun Pataleta
7f18f22fac Merge branch 'MDL-66272-master' of git://github.com/vmdef/moodle 2019-08-08 12:43:51 +08:00
Amaia Anabitarte
82ca410f23 MDL-60636 behat: Fixing modified xpath 2019-08-08 11:58:03 +08:00
Andrew Nicols
419a67aad3 Merge branch 'MDL-65933-master' of git://github.com/junpataleta/moodle 2019-08-08 11:41:50 +08:00
Jun Pataleta
d3455c0da1 Merge branch 'MDL-59470' of https://github.com/Chocolate-lightning/moodle 2019-08-08 10:40:51 +08:00
Mathew May
7456bf413b MDL-59470 admin: Add Behat test for duplicating a tour 2019-08-08 10:30:12 +08:00
Andrew Nicols
9f0cf3e855 Merge branch 'MDL-65595-master' of git://github.com/peterRd/moodle 2019-08-08 10:28:15 +08:00
Jun Pataleta
07d00f0548 Merge branch 'MDL-64032-master-fix' of https://github.com/andrewnicols/moodle 2019-08-08 10:23:10 +08:00
Andrew Nicols
b6a226f96f MDL-64032 user: Comment out failing behat tests
These are failing because of an unrelated issue which is possibly quite
an edge case.
2019-08-08 09:31:00 +08:00
Mathew May
71fd7b1139 MDL-59470 behat: Add a element comtains x occurrences step 2019-08-08 09:16:19 +08:00
Mathew May
c48fbb6c9b MDL-59470 admin: A user tour can now be duplicated 2019-08-08 09:16:17 +08:00
Jun Pataleta
7fda7cf71b Merge branch 'MDL-57239' of https://github.com/timhunt/moodle 2019-08-08 08:49:56 +08:00
Jun Pataleta
30c8bf169e Merge branch 'MDL-50346-master' of git://github.com/andrewnicols/moodle 2019-08-07 17:11:31 +08:00
Andrew Nicols
08bec34297 Merge branch 'MDL-66039-master' of git://github.com/bmbrands/moodle 2019-08-07 15:31:43 +08:00
Brendan Heywood
32f805e079 MDL-66278 core: Add callback to show other password checks on signup 2019-08-07 14:12:04 +08:00
Jun Pataleta
9897d03d95 Merge branch 'MDL-56789-master' of git://github.com/rezaies/moodle 2019-08-07 14:01:39 +08:00
Sara Arjona
96d497204f Merge branch 'MDL-61649-master' of git://github.com/aanabit/moodle 2019-08-07 13:33:04 +08:00
Shamim Rezaie
f73b22a3ac MDL-56789 core: Improve unit tests 2019-08-07 15:25:16 +10:00
Shamim Rezaie
36272110ba MDL-56789 core: Recycle bin warn only if a grade item is being deleted 2019-08-07 15:25:11 +10:00
Shamim Rezaie
6cdf0207ff MDL-56789 core: Added unit test for course_modules_pending_deletion 2019-08-07 14:18:11 +10:00
Andrew Nicols
0261d1effa MDL-50346 core: Allow sub-directories in template names 2019-08-07 11:44:49 +08:00
Jun Pataleta
cb6e7dc70c Merge branch 'MDL-59639-master' of git://github.com/bmbrands/moodle 2019-08-07 11:29:32 +08:00
Amaia Anabitarte
c7f88457cd MDL-61649 email: Send plain/html format emails based on user preference 2019-08-07 11:20:02 +08:00
Sara Arjona
ab1fa2dbac Merge branch 'MDL-63198-master' of git://github.com/rezaies/moodle 2019-08-07 11:07:50 +08:00
Andrew Nicols
638097810d Merge branch 'mdl-66280' of https://github.com/Peterburnett/moodle 2019-08-07 10:22:04 +08:00
Sara Arjona
600d8df255 Merge branch 'MDL-60636-master' of git://github.com/bmbrands/moodle 2019-08-07 10:00:44 +08:00
Andrew Nicols
91d50e2eda Merge branch 'MDL-57618-master' of git://github.com/cescobedo/moodle 2019-08-06 15:56:07 +08:00
Sara Arjona
a12718673a Merge branch 'MDL-64598-master' of https://github.com/lucaboesch/moodle 2019-08-06 15:29:52 +08:00
Bas Brands
fbd99bbb00 MDL-59639 theme_boost: remember last visited tab 2019-08-06 08:54:23 +02:00
Andrew Nicols
c0535be52a Merge branch 'MDL-66234_master' of git://github.com/dmonllao/moodle 2019-08-06 14:25:20 +08:00
Sara Arjona
e9fc5a7381 Merge branch 'MDL-65786-master' of git://github.com/rezaies/moodle 2019-08-06 14:19:17 +08:00
Jun Pataleta
9744897d27 Merge branch 'MDL-66306-master' of git://github.com/lameze/moodle 2019-08-06 14:03:17 +08:00
Simey Lameze
02523182f9 MDL-66306 lib: upgrade moodle lib docs 2019-08-06 13:59:37 +08:00
Simey Lameze
f0f88f7f2b MDL-66306 lib: update phpmailer to 6.0.7 2019-08-06 13:48:28 +08:00