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

87547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jun Pataleta
f9b3597e21 Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle 2018-01-09 09:52:47 +08: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
Eloy Lafuente (stronk7)
abe4713565 Merge branch 'MDL-61098-master' of git://github.com/jleyva/moodle 2018-01-08 21:06:13 +01:00
Eloy Lafuente (stronk7)
8d9a55a05b Merge branch 'master_MDL-61050' of https://github.com/danmarsden/moodle 2018-01-08 20:38:29 +01:00
Eloy Lafuente (stronk7)
d8ef541bbc Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle 2018-01-08 19:56:24 +01:00
David Monllao
1b9fcbf7a7 Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle 2018-01-08 17:42:30 +01:00
David Monllao
cba780d418 Merge branch 'MDL-57892_filter_outline' of git://github.com/davosmith/moodle 2018-01-08 17:19:12 +01:00
David Monllao
22a9fed6b2 Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle 2018-01-08 14:58:31 +01:00
Andrew Nicols
2cf6b060cd MDL-61169 iplookup: Change to github.com IP 2018-01-08 17:15:12 +08:00
Eloy Lafuente (stronk7)
7110a3eed6 Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle 2018-01-08 10:05:39 +01:00
Andrew Nicols
b3f7f6d096 Merge branch 'MDL-57786-master' of git://github.com/zig-moodle/moodle 2018-01-08 15:16:06 +08:00
Andrew Nicols
7d6d0788f2 Merge branch 'MDL-43042-master' of git://github.com/mihailges/moodle 2018-01-08 15:12:51 +08:00
Andrew Nicols
0b4304b6e3 Merge branch 'MDL-53985-master' of git://github.com/damyon/moodle 2018-01-08 12:39:19 +08:00
Andrew Nicols
098f4337d2 MDL-61068 mod_forum: Round timed posts to nearest 60 seconds 
This slightly reduces the effectiveness of the DB query cache, but gives
us correct results every time.
 2018-01-05 16:43:02 +08:00
Mihail Geshoski
7b319d20a8 MDL-43042 lesson: Confusing feedback order in multiple answer questions 2018-01-05 15:03:14 +08:00
Dan Marsden
0c64c64b48 MDL-61050 auth_ldap: fix regression caused by MDL-42834 2018-01-05 10:43:20 +13:00
sam marshall
d20ec3606b MDL-60943 core_search: Improve exception for preg_replace errors 2018-01-04 17:27:46 +00:00
Helen Foster
700522badd MDL-61046 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* pluginname_desc, enrol_category - improved explanation
* pathtopythondesc, core_admin - mentioning Python version
* configdeleteunconfirmed, core_admin - setting applies to more than
  just email-based self-registration
 2018-01-04 11:30:54 +01:00
David Monllao
013f0b2266 weekly release 3.5dev 2018-01-04 11:02:34 +01:00
David Monllao
443d34d115 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-01-04 11:02:33 +01:00
Marina Glancy
099bca6de6 MDL-60742 calendar: allow customisation of 12/24h time format strings 2018-01-04 15:16:08 +08:00
Jun Pataleta
06634b7550 Merge branch 'MDL-40613-master-ldap' of git://github.com/andrewnicols/moodle 2018-01-04 14:57:32 +08:00
Andrew Nicols
725fcf3178 MDL-40613 auth_ldap: Call update_user_record on create 2018-01-04 14:32:13 +08:00
Jun Pataleta
0138cb7cf1 Merge branch 'MDL-40613_master-fix' of git://github.com/markn86/moodle 2018-01-04 09:57:38 +08:00
AMOS bot
b8787d5957 Automatically generated installer lang files 2018-01-04 00:06:51 +00:00
Davo Smith
385280469a MDL-57892 report_outline: add behat tests 2018-01-03 12:52:50 +00:00
Davo Smith
eadd195151 MDL-57892 report_outline: add date filter 2018-01-03 12:52:50 +00:00
Davo Smith
4e737cf37f MDL-60427 dndupload: detect attempts to upload folders 2018-01-03 12:36:32 +00:00
Mark Nelson
e8a1a5868a MDL-40613 auth_ldap: removed usage of profile_load_custom_fields() 
Also reverted profile_load_custom_fields() signature and changed
behaviour of the new function profile_save_custom_fields().
 2018-01-03 18:13:01 +08:00
Jun Pataleta
60236650d6 Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle 2018-01-03 16:53:49 +08:00
Jun Pataleta
80d7aa1813 Merge branch 'MDL-56543-master' of git://github.com/ankitagarwal/moodle 2018-01-03 09:26:12 +08:00
AMOS bot
610ab37f55 Automatically generated installer lang files 2018-01-03 00:06:15 +00:00
Eloy Lafuente (stronk7)
ff9a93a8b6 Merge branch 'MDL-23887-master-2' of https://github.com/snake/moodle 2018-01-03 00:24:41 +01:00
David Monllao
e3cd0dfc2c Merge branch 'MDL-57727-master' of git://github.com/mihailges/moodle 2018-01-02 12:33:40 +01:00
Jake Dallimore
fa2a9cc933 MDL-23887 database: fix use of deprecated system tables for mssql 
Catalog views are available which we should use instead.
 2018-01-02 17:19:17 +08:00
Jun Pataleta
1588837a9d Merge branch 'MDL-40613_master' of git://github.com/markn86/moodle 2018-01-02 16:50:29 +08:00
David Monllao
6ffb51e74c Merge branch 'MDL-59813-master' of git://github.com/farhan6318/moodle 2018-01-02 09:03:03 +01:00
David Monllao
b5e7264543 Merge branch 'MDL-61107' of git://github.com/timhunt/moodle 2018-01-02 08:34:39 +01:00
Zig Tan
e5d9af8c56 MDL-57786 mod_assign: Fix word count for online text submissions 2018-01-02 13:10:37 +08:00