85890 Commits

Author SHA1 Message Date
Jun Pataleta
b3cfb01316 weekly release 3.4dev 2017-09-01 13:26:56 +08:00
Jun Pataleta
033b0c9bb6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-09-01 13:26:55 +08:00
Andrew Nicols
c7c5d12353 MDL-59801 tool_lp: Behat fix for autocomplete
An earlier Behat fix made the use of autocomplete stricter on checking
an exact match instead of a substring, which in turn broke this use
which was searching for a partial match.
2017-09-01 08:24:51 +08:00
Andrew Nicols
256518a635 Merge branch 'MDL-56646-master-fix' of https://github.com/xow/moodle 2017-08-31 15:00:08 +08:00
John Okely
8812040612 MDL-56646 mod_assign: Improve grade fix strings 2017-08-31 14:39:54 +08:00
John Okely
5ded13e65a MDL-56646 mod_assign: Make rescale behat more specific 2017-08-31 14:39:54 +08:00
Andrew Nicols
f33afd1df5 Merge branch 'MDL-59801-master-fix1' of http://github.com/damyon/moodle 2017-08-31 14:12:31 +08:00
Damyon Wiese
d29be32000 MDL-59801 users: Behat fixes
Firstly - the list of roles to filter needs to be a combination of the assignable roles and the existing roles in the course.
Secondly - the auto-complete behat step needs to search for entire strings, not substrings.
2017-08-31 12:32:03 +08:00
Andrew Nicols
4bd649d31a Merge branch 'MDL-59828-master-fix1' of http://github.com/damyon/moodle 2017-08-31 10:25:49 +08:00
Damyon Wiese
5c1d5a6d7c MDL-59828 inplaceeditable: CSS class fix
The form-autocomplete-original-select was applied to the wrong element.

inplaceeditable selects => inplaceeditable autocompletes
2017-08-31 10:16:53 +08:00
Andrew Nicols
881bf1da5c Merge branch 'MDL-59832_master-fix' of git://github.com/markn86/moodle 2017-08-30 15:44:24 +08:00
Mark Nelson
431723eccc MDL-59832 core_course: removed faulty logic in unit test 2017-08-30 12:55:57 +08:00
Andrew Nicols
8c2465eaf0 Merge branch 'MDL-59394-master-2' of git://github.com/ryanwyllie/moodle 2017-08-30 11:35:40 +08:00
Andrew Nicols
4520fdffd5 Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle 2017-08-30 11:30:59 +08:00
Ryan Wyllie
a06b3a27b7 MDL-59713 calendar: fix nav link ajax reload 2017-08-30 03:25:39 +00:00
Ryan Wyllie
aefb2950d3 MDL-59394 calendar: add drag and drop between months 2017-08-30 02:42:06 +00:00
Jun Pataleta
9e22016778 Merge branch 'MDL-59884-master' of git://github.com/lameze/moodle 2017-08-30 10:10:30 +08:00
Simey Lameze
b31a169560 MDL-59884 core_calendar: display spinner when reloading month content 2017-08-30 09:48:56 +08:00
Simey Lameze
63cb267c1b MDL-59884 themes: add styles for overlay loading 2017-08-30 09:47:18 +08:00
Simey Lameze
8dc85f9c04 MDL-59884 core: add new overlay_loading template 2017-08-30 09:44:22 +08:00
Andrew Nicols
a85c077a64 Merge branch 'MDL-59713' of https://github.com/stronk7/moodle 2017-08-30 08:20:09 +08:00
Eloy Lafuente (stronk7)
7d08eccf43 Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle 2017-08-30 01:21:22 +02:00
Eloy Lafuente (stronk7)
9533cf3419 Merge branch 'MDL-59779_master' of git://github.com/dmonllao/moodle 2017-08-30 01:09:20 +02:00
Eloy Lafuente (stronk7)
08986e0c42 Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle 2017-08-30 00:36:07 +02:00
Eloy Lafuente (stronk7)
a4cdbff86c MDL-59713 forms: prevent php warning when 'optional' option is missing 2017-08-29 20:12:41 +02:00
Dan Poltawski
e517eb100c Merge branch 'MDL-59951-master' of git://github.com/damyon/moodle 2017-08-29 14:32:43 +01:00
Dan Poltawski
08220d64f6 Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle 2017-08-29 11:54:07 +01:00
Dan Poltawski
253ea6621a Merge branch 'MDL-59615-master' of git://github.com/damyon/moodle 2017-08-29 10:58:42 +01:00
Jun Pataleta
7f56c2679d Merge branch 'MDL-59908-master' of git://github.com/ankitagarwal/moodle 2017-08-29 17:41:39 +08:00
Dan Poltawski
4e597bf219 Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle 2017-08-29 10:24:50 +01:00
Jun Pataleta
faf83f3d41 Merge branch 'MDL-59830_master-v2' of git://github.com/markn86/moodle 2017-08-29 17:23:44 +08:00
Mark Nelson
1329ffd7b7 MDL-59830 core_user: do not show roles that can not be deleted 2017-08-29 17:12:26 +08:00
Mark Nelson
5700ad902a MDL-59801 core_user: add missing class variable declaration
Also minor fix to PHPDocs.
2017-08-29 16:28:56 +08:00
Andrew Nicols
350ef63246 Merge branch 'MDL-56646-master' of https://github.com/xow/moodle 2017-08-29 15:51:01 +08:00
Jun Pataleta
b26ce53776 Merge branch 'MDL-59823-master' of git://github.com/damyon/moodle 2017-08-29 15:49:24 +08:00
Andrew Nicols
08bcea48d4 Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle 2017-08-29 15:28:45 +08:00
Andrew Nicols
506708f196 Merge branch 'MDL-59820-master' of git://github.com/lameze/moodle 2017-08-29 15:26:46 +08:00
Jun Pataleta
b83a329ad6 Merge branch 'MDL-59822-master' of git://github.com/damyon/moodle 2017-08-29 15:25:33 +08:00
John Okely
465b75ed1f MDL-56646 assign: Fix negative grades in restore 2017-08-29 07:23:01 +00:00
John Okely
7323c473cc MDL-56646 assign: Add ability to fix errant grades 2017-08-29 07:23:01 +00:00
Andrew Nicols
6d2ff19051 Merge branch 'MDL-59827-master-fix1' of http://github.com/damyon/moodle 2017-08-29 15:14:20 +08:00
Damyon Wiese
b0b6ff3c18 MDL-59827 users: Typo in force_open()
force_open() not forceopen()
2017-08-29 15:06:43 +08:00
Andrew Nicols
27e827e181 Merge branch 'MDL-59821-master' of git://github.com/damyon/moodle 2017-08-29 14:54:33 +08:00
Jun Pataleta
33b46e54bb Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle 2017-08-29 14:48:04 +08:00
Andrew Nicols
3bb2900cf7 Merge branch 'MDL-59030_master' of git://github.com/dmonllao/moodle 2017-08-29 14:34:59 +08:00
David Monllao
f07d93de9d MDL-59030 analytics: Social breadth accepting more than level 2
Even if core indicators are limited to level 2 we should not block
other activities from implementing up to level 5.
2017-08-29 08:28:46 +02:00
Jun Pataleta
4f9dfd0f8d Merge branch 'MDL-59628-master' of git://github.com/damyon/moodle 2017-08-29 13:49:55 +08:00
Andrew Nicols
3eb0d7db6d Merge branch 'MDL-59827-master' of git://github.com/damyon/moodle 2017-08-29 13:21:22 +08:00
Andrew Nicols
d3e6c398f4 Merge branch 'MDL-35290-master' of https://github.com/snake/moodle 2017-08-29 13:14:22 +08:00
David Monllao
e8c2abcea6 MDL-59030 testing: Tests for core_course analytics indicators 2017-08-29 06:24:06 +02:00