Commit Graph

89847 Commits

Author SHA1 Message Date
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
Shamim Rezaie e4d3ed18ff MDL-61166 Groups: Fixed a typo in PHPDoc 2018-01-14 09:18:12 +11:00
wehr 122c999536 MDL-60812 enrol_manual: Fixes not working default role 2018-01-12 16:13:27 +01:00
David Balch 224796f0fa MDL-60548 profile: Behat tests for email display in profiles. 2018-01-12 11:36:43 +00:00
sam marshall 470d59d31f MDL-61063 Scheduled tasks: Add link to clear fail delay 2018-01-12 11:10:29 +00:00
Farhan Karmali 6363c9ade2 MDL-37390 course: Set startdate and enddate properly for approved course
Once a course is approved the startdate and enddate were not set properly
This patch sets current date as startdate and enddate is startdate +
default duration of the course
2018-01-12 10:02:18 +01:00
Farhan Karmali 19f0685069 MDL-61081 enrol: Start and end date for courses created by external db
Course created by external db enrolment plugin should have start date as current date
and end date is todays date + default course duration
2018-01-12 09:57:22 +01:00
wehr e6a87bd192 MDL-61156 enrol_manual: Fixes not working manual quick enrolment in IE11 2018-01-12 09:14:28 +01:00
Stephen Bourget dccd9540d0 MDL-61205 completion: allow expected completion to support time 2018-01-11 21:30:13 -05:00
Andrew Nicols 4b55982446 MDL-61204 user: Fix random failure in behat
We need to get into the habit of not using usernames like 'student1'
and 'student10' as our matches are non-strict, and the tests become
dependent upon DB sort order.

This change adds a character after the varying value to act as a
delimter for all of these tests.
2018-01-12 09:35:56 +08:00
Eloy Lafuente (stronk7) f5b956679e weekly release 3.5dev 2018-01-12 02:12:35 +01:00
Juan Leyva ff626f7bb1 MDL-58711 mod_assign: Handle groups in get_submission_status 2018-01-11 15:03:08 +01:00
Jake Dallimore 9b49ac26d5 Merge branch 'MDL-61177-master' of git://github.com/andrewnicols/moodle 2018-01-11 09:22:24 +08:00
David Monllao 197672e26c Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle 2018-01-10 12:16:38 +01:00
David Knuplesch cc3c33f8ba MDL-60549 lti: support for moving embedded lti into separate tab 2018-01-10 12:08:44 +01:00
Davo Smith 96eaee3daf MDL-60427 dndupload: fix Firefox handling of 0-byte folders 2018-01-10 09:58:51 +00:00
Cameron Ball 9aa776a848 MDL-61143 core_files: Don't append dot when checking domain names or IP addresses.
Previously we appended a dot at the end of IP addresses and domain names in the
cURL security helper, but it causes issues with Google OAuth so this patch removes it.
2018-01-10 15:22:17 +08:00
Andrew Nicols 6d019541ad Merge branch 'MDL-43648-int-fix-1' of github.com:ryanwyllie/moodle 2018-01-10 10:38:20 +08:00
Ryan Wyllie 9f421a184a MDL-43648 form: fix hours and minutes in date_time_selector 2018-01-10 02:28:19 +00:00
Andrew Nicols 168fc2d9ec Merge branch 'MDL-61061_hideif_group' of git://github.com/davosmith/moodle 2018-01-10 08:46:05 +08:00
Andrew Nicols 57e226b96f MDL-61177 badges: JS pending checks in connection test 2018-01-10 08:12:59 +08:00
Andrew Hancox 18e1450b4b MDL-41090 questions: Support for files in behaviour response 2018-01-09 21:12:58 +00:00
Adrian Greeve f1d1a60e0a MDL-61131 repositories: Added a key to verify incoming urls. 2018-01-09 11:34:37 +01:00
Cameron Ball 4cca0082df MDL-61143 core_files: Update unit tests for curl_security_helper
Previously some of the unit tests were passing "by accident" becuase
we had the security helper letting through domains where the DNS lookup
failed. That behaviour has changed and now such domains are blocked.

Additionally tests for domains with multiple A records and weird Unicode
stuff have been added.

This patch also mocks the DNS resolution in the test, rather than actually
resolving the domain.
2018-01-09 16:54:32 +08:00
Cameron Ball fbe7f1f8ba MDL-61143 core_files: Block hosts that cannot be determined to be an IP address of domain name
Freaky deaky Unicode/octal/hex domains can be resolved by cURL but are technically not valid.

This patch causes anything that Moodle does not consider to be a valid domain or IP to be blocked
by the cURL security helper.
2018-01-09 16:54:32 +08:00
Cameron Ball cae2eb357d MDL-61143 core_files: Check all A records when testing blocked IPs 2018-01-09 16:54:32 +08:00
Juan Leyva 01a79b4e86 MDL-60908 mod_quiz: Return question state only when configured
The question state should be returned following the quiz review options
settings.
2018-01-09 16:54:32 +08:00
David Monllao 51673a3469 Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle 2018-01-09 09:52:44 +01:00
David Monllao 1679485693 Merge branch 'MDL-60079-master' of https://github.com/nashtechdev01/moodle 2018-01-09 08:09:15 +01:00
Andrew Nicols a52fc1f7a8 Merge branch 'wip-MDL-60415-master' of git://github.com/abgreeve/moodle 2018-01-09 14:30:34 +08:00
David Knuplesch a2701db412 MDL-60415 mod_lti: avoid confusing error-message 2018-01-09 14:00:37 +08:00
Ryan Wyllie 60908b2187 MDL-60967 calendar: only load course filter when required 2018-01-09 05:57:38 +00:00
Thinh Pham 48a9fd89e0 MDL-60079 User tours: leave unnecessary aria tags in the page 2018-01-09 11:26:14 +07:00
Andrew Nicols 61f56fd5f9 Merge branch 'MDL-43648_m35v2' of https://github.com/sbourget/moodle 2018-01-09 11:43:33 +08:00
Ryan Wyllie a606f2e2c5 MDL-60967 calendar: preload contexts in course_filter_selector 2018-01-09 03:04:41 +00:00
Jun Pataleta f9b3597e21 Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle 2018-01-09 09:52:47 +08:00
Ryan Wyllie 4e6c9ead6d MDL-60959 calendar: remove duplicate events export in weekday 2018-01-09 01:51:13 +00:00
Ryan Wyllie 6b02488559 MDL-60959 calendar: remove duplicate course export in event exporter 2018-01-09 01:51:13 +00:00
Ryan Wyllie bb4691ec7b MDL-60959 calendar: use related course in calendar_event_exporter 2018-01-09 01:51:12 +00:00
Andrew Nicols 08ac68de3e MDL-61068 mod_forum: Fix neighbour test dates 2018-01-09 09:08:40 +08:00
Eloy Lafuente (stronk7) b9e05ae65d Merge branch 'MDL-60943-master' of https://github.com/sammarshallou/moodle 2018-01-09 00:52:17 +01:00