Commit graph

88537 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b678f3309d Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 10:55:23 +01:00
David Monllao
09896c35f2 Merge branch 'MDL-60963-master' of git://github.com/ryanwyllie/moodle 2018-01-17 10:49:58 +01:00
Eloy Lafuente (stronk7)
2ab36722f2 Merge branch 'MDL-53113-master' of git://github.com/junpataleta/moodle 2018-01-17 10:37:23 +01:00
Juan Leyva
ddeabbc53a MDL-58711 mod_assign: Fix draft and submission counting 2018-01-17 09:49:46 +01:00
Mark Nelson
822fe4fc15 MDL-60814 auth_ldap: prevent setting names breaking site upgrades 2018-01-17 14:18:02 +08:00
Ryan Wyllie
3152de6a8d MDL-60963 calendar: use related cache for module instances in export 2018-01-17 03:23:36 +00:00
Jun Pataleta
dd9c292700 MDL-53113 libraries: Add cleaned up PHP doc blocks 2018-01-17 10:52:16 +08:00
Eloy Lafuente (stronk7)
87f6dfdedc Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle 2018-01-17 02:27:22 +01:00
Eloy Lafuente (stronk7)
76f8b36105 MDL-53113 libraries: Also remove core_renderer->notify_xxx() methods
Keeping the methods instead of fully deleting them alternative.
2018-01-17 02:18:16 +01:00
Eloy Lafuente (stronk7)
0e68db9e83 MDL-41312 groups: documment final removal in upgrade.txt 2018-01-17 02:04:16 +01:00
Eloy Lafuente (stronk7)
8bdee69d3e Merge branch 'MDL-41312-master' of git://github.com/ankitagarwal/moodle 2018-01-17 02:02:54 +01:00
AMOS bot
300ace312e Automatically generated installer lang files 2018-01-17 00:06:20 +00:00
Stephen Bourget
cfdd8d12dd MDL-61203 badges: Allow profile picture as badge criteria 2018-01-16 10:18:23 -05:00
Jun Pataleta
3f5cae3679 Merge branch 'MDL-61221-master' of git://github.com/andrewnicols/moodle 2018-01-16 23:00:59 +08:00
David Monllao
641e7d41a6 MDL-60967 calendar: Add argument for missing mini param 2018-01-16 13:30:14 +01:00
David Monllao
abf089f2a3 Merge branch 'MDL-60967-master' of git://github.com/ryanwyllie/moodle 2018-01-16 12:36:27 +01:00
KietLy
26872a8006 MDL-60078 User tours accessibility: Tab should go back into the pop-up 2018-01-16 17:36:25 +07:00
Mark Nelson
e4d9eff640 MDL-61224 core_role: prevent short name from exceeding 100 chars 2018-01-16 18:14:42 +08:00
Andrew Nicols
68c2b72673 MDL-61223 course: Set default course start date 2018-01-16 14:26:19 +08:00
Andrew Nicols
389aad6eef MDL-61221 badges: Ignore site availabilty for behat
Behat sites should not be available publically, and the check against
the backpack API for site availablity can time out in some situations.

We should be testing as though the site _is_ available, as this is the
standard expectation.
2018-01-16 13:21:51 +08:00
Adam Olley
e36a2f2aa7 MDL-60918 core_message: update preferences of user behat test 2018-01-16 05:07:13 +00:00
Andrew Nicols
174fbacc9b Merge branch 'MDL-60815-master' of git://github.com/ryanwyllie/moodle 2018-01-16 12:27:43 +08:00
Ryan Wyllie
745783fa13 MDL-60918 message: use current user in message preference update 2018-01-16 03:49:55 +00:00
Ryan Wyllie
bb8bb8e41c MDL-60815 theme: fix loading editor styles 2018-01-16 03:39:09 +00:00
Jun Pataleta
56c9d66652 MDL-50469 core: Update lib/upgrade.txt about notify() final deprecation 2018-01-16 11:34:00 +08:00
Ankit Agarwal
943e290059 MDL-50469 libraries: Final deprecation of notify() 2018-01-16 11:28:26 +08:00
Andrew Nicols
5705fd0907 Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle 2018-01-16 10:08:26 +08:00
Andrew Nicols
0881745a9e Merge branch 'MDL-59567-master' of https://github.com/mackensen/moodle 2018-01-16 09:30:59 +08:00
Eloy Lafuente (stronk7)
5242a76a4b Merge branch 'MDL-61204-master' of git://github.com/andrewnicols/moodle 2018-01-16 02:16:40 +01:00
Eloy Lafuente (stronk7)
3e9282d486 Merge branch 'MDL-60959-master' of git://github.com/ryanwyllie/moodle 2018-01-16 01:14:39 +01:00
AMOS bot
f79437ef3b Automatically generated installer lang files 2018-01-16 00:06:27 +00:00
Eloy Lafuente (stronk7)
4fa58ece62 Merge branch 'MDL-61081-master' of git://github.com/sarjona/moodle 2018-01-16 00:27:38 +01:00
Eloy Lafuente (stronk7)
2b2cad6f0a Merge branch 'MDL-37390-master' of git://github.com/sarjona/moodle 2018-01-16 00:25:15 +01:00
Eloy Lafuente (stronk7)
d2d919e478 Merge branch 'MDL-61162-master' of git://github.com/junpataleta/moodle 2018-01-15 22:57:12 +01:00
Eloy Lafuente (stronk7)
d7ba45290b Merge branch 'MDL-61063-master' of https://github.com/sammarshallou/moodle 2018-01-15 22:02:08 +01:00
Ankit Agarwal
3becfcd226 MDL-53113 libraries: Remove deprecated constants 2018-01-15 20:19:07 +01:00
Eloy Lafuente (stronk7)
b3b79085e6 Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle 2018-01-15 19:09:52 +01:00
Tim Hunt
bccad386b0 MDL-61077 question stats: make calculations more robust 2018-01-15 16:07:57 +00:00
David Monllao
88d7a6a6b7 MDL-60960 qtype_essay: Update specific_filepicker_options deprecation message 2018-01-15 15:58:19 +01:00
David Monllao
f4a30c5fdf Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle 2018-01-15 15:52:29 +01:00
David Balch
d2bba97d77 MDL-60548 profile: Clarify some users can always see email addresses. 2018-01-15 12:21:09 +00:00
David Balch
565f3f25f0 MDL-60548 profile: Show profile email when 'maildisplay' allows it.
Adds 'email' to hiddenuserfields, which allows:
 * user to view email on their own profile,
 * users with cap site:viewuseridentity to view email on any profile (admins/teachers)
 * admin to veto display of email to users without site:viewuseridentity (except viewing their own)
 * unprivileged users to view if the profile's maildisplay permits it.

Changes in user/lib.php include removal of is_siteadmin() test, which
is redundant due to checks via has_capability().

Fixes regression from 2.9 (MDL-45774).
2018-01-15 12:21:09 +00:00
Andrew Hancox
f3d9872aa3 MDL-41090 questions: Allow embedding files in response comments 2018-01-15 11:19:06 +00:00
Andrew Hancox
fd2ce923cf MDL-41090 questions: Move editor and filepicker options into engine 2018-01-15 11:19:01 +00:00
David Monllao
2692af9032 Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle 2018-01-15 12:10:20 +01:00
Eloy Lafuente (stronk7)
c1dd6af98a Merge branch 'MDL-61166-master' of git://github.com/rezaies/moodle 2018-01-15 10:57:38 +01:00
David Monllao
e3d292301e Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle 2018-01-15 10:05:05 +01:00
David Monllao
5d89d24bea Merge branch 'MDL-61010-master' of git://github.com/andrewnicols/moodle 2018-01-15 09:53:48 +01:00
Andrew Nicols
110965aecd Merge branch 'MDL-61205_m35v1' of git://github.com/sbourget/moodle 2018-01-15 14:17:01 +08:00
Andrew Nicols
a7db60dcf1 Merge branch 'MDL-61156-master' of https://github.com/mwehr/moodle 2018-01-15 13:48:08 +08:00