mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
87,598 Commits 36 Branches 527 Tags
Commit Graph

87598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
174fbacc9b Merge branch 'MDL-60815-master' of git://github.com/ryanwyllie/moodle 2018-01-16 12:27:43 +08:00
Ryan Wyllie
bb8bb8e41c MDL-60815 theme: fix loading editor styles 2018-01-16 03:39:09 +00: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
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
Eloy Lafuente (stronk7)
b3b79085e6 Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle 2018-01-15 19:09:52 +01: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
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
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
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
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