Eloy Lafuente (stronk7) [Mon, 15 Jan 2018 21:02:08 +0000 (22:02 +0100)]
Merge branch 'MDL-61063-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 15 Jan 2018 18:09:52 +0000 (19:09 +0100)]
Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle
David Monllao [Mon, 15 Jan 2018 14:58:19 +0000 (15:58 +0100)]
MDL-60960 qtype_essay: Update specific_filepicker_options deprecation message
David Monllao [Mon, 15 Jan 2018 14:52:29 +0000 (15:52 +0100)]
Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle
Andrew Hancox [Fri, 5 Jan 2018 18:44:07 +0000 (18:44 +0000)]
MDL-41090 questions: Allow embedding files in response comments
Andrew Hancox [Fri, 5 Jan 2018 18:43:27 +0000 (18:43 +0000)]
MDL-41090 questions: Move editor and filepicker options into engine
David Monllao [Mon, 15 Jan 2018 11:10:20 +0000 (12:10 +0100)]
Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Mon, 15 Jan 2018 09:57:38 +0000 (10:57 +0100)]
Merge branch 'MDL-61166-master' of git://github.com/rezaies/moodle
David Monllao [Mon, 15 Jan 2018 09:05:05 +0000 (10:05 +0100)]
Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle
David Monllao [Mon, 15 Jan 2018 08:53:48 +0000 (09:53 +0100)]
Merge branch 'MDL-61010-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 15 Jan 2018 06:17:01 +0000 (14:17 +0800)]
Merge branch 'MDL-61205_m35v1' of git://github.com/sbourget/moodle
Andrew Nicols [Mon, 15 Jan 2018 05:48:08 +0000 (13:48 +0800)]
Merge branch 'MDL-61156-master' of https://github.com/mwehr/moodle
Shamim Rezaie [Sat, 13 Jan 2018 22:18:12 +0000 (09:18 +1100)]
MDL-61166 Groups: Fixed a typo in PHPDoc
sam marshall [Tue, 19 Dec 2017 13:31:14 +0000 (13:31 +0000)]
MDL-61063 Scheduled tasks: Add link to clear fail delay
wehr [Fri, 12 Jan 2018 08:14:28 +0000 (09:14 +0100)]
MDL-61156 enrol_manual: Fixes not working manual quick enrolment in IE11
Stephen Bourget [Fri, 12 Jan 2018 02:30:13 +0000 (21:30 -0500)]
MDL-61205 completion: allow expected completion to support time
Eloy Lafuente (stronk7) [Fri, 12 Jan 2018 01:12:35 +0000 (02:12 +0100)]
weekly release 3.5dev
Jake Dallimore [Thu, 11 Jan 2018 01:22:24 +0000 (09:22 +0800)]
Merge branch 'MDL-61177-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 10 Jan 2018 11:16:38 +0000 (12:16 +0100)]
Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle
Davo Smith [Wed, 10 Jan 2018 09:58:51 +0000 (09:58 +0000)]
MDL-60427 dndupload: fix Firefox handling of 0-byte folders
Cameron Ball [Wed, 10 Jan 2018 06:57:29 +0000 (14:57 +0800)]
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.
Andrew Nicols [Wed, 10 Jan 2018 02:38:20 +0000 (10:38 +0800)]
Merge branch 'MDL-43648-int-fix-1' of github.com:ryanwyllie/moodle
Ryan Wyllie [Wed, 10 Jan 2018 02:28:19 +0000 (02:28 +0000)]
MDL-43648 form: fix hours and minutes in date_time_selector
Andrew Nicols [Wed, 10 Jan 2018 00:46:05 +0000 (08:46 +0800)]
Merge branch 'MDL-61061_hideif_group' of git://github.com/davosmith/moodle
Andrew Nicols [Wed, 10 Jan 2018 00:12:52 +0000 (08:12 +0800)]
MDL-61177 badges: JS pending checks in connection test
Andrew Hancox [Fri, 5 Jan 2018 18:40:54 +0000 (18:40 +0000)]
MDL-41090 questions: Support for files in behaviour response
Adrian Greeve [Fri, 5 Jan 2018 02:49:39 +0000 (10:49 +0800)]
MDL-61131 repositories: Added a key to verify incoming urls.
Cameron Ball [Wed, 3 Jan 2018 08:10:37 +0000 (16:10 +0800)]
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.
Cameron Ball [Wed, 3 Jan 2018 08:09:49 +0000 (16:09 +0800)]
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.
Cameron Ball [Tue, 2 Jan 2018 06:42:09 +0000 (14:42 +0800)]
MDL-61143 core_files: Check all A records when testing blocked IPs
Juan Leyva [Thu, 7 Dec 2017 18:07:27 +0000 (19:07 +0100)]
MDL-60908 mod_quiz: Return question state only when configured
The question state should be returned following the quiz review options
settings.
David Monllao [Tue, 9 Jan 2018 08:52:44 +0000 (09:52 +0100)]
Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 9 Jan 2018 07:09:15 +0000 (08:09 +0100)]
Merge branch 'MDL-60079-master' of https://github.com/nashtechdev01/moodle
Andrew Nicols [Tue, 9 Jan 2018 06:30:34 +0000 (14:30 +0800)]
Merge branch 'wip-MDL-60415-master' of git://github.com/abgreeve/moodle
David Knuplesch [Tue, 12 Dec 2017 10:44:44 +0000 (11:44 +0100)]
MDL-60415 mod_lti: avoid confusing error-message
Thinh Pham [Wed, 4 Oct 2017 01:54:54 +0000 (08:54 +0700)]
MDL-60079 User tours: leave unnecessary aria tags in the page
Andrew Nicols [Tue, 9 Jan 2018 03:43:33 +0000 (11:43 +0800)]
Merge branch 'MDL-43648_m35v2' of https://github.com/sbourget/moodle
Jun Pataleta [Tue, 9 Jan 2018 01:52:47 +0000 (09:52 +0800)]
Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 9 Jan 2018 01:08:40 +0000 (09:08 +0800)]
MDL-61068 mod_forum: Fix neighbour test dates
Eloy Lafuente (stronk7) [Mon, 8 Jan 2018 23:52:17 +0000 (00:52 +0100)]
Merge branch 'MDL-60943-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jan 2018 20:06:13 +0000 (21:06 +0100)]
Merge branch 'MDL-61098-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jan 2018 19:38:29 +0000 (20:38 +0100)]
Merge branch 'master_MDL-61050' of https://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jan 2018 18:56:24 +0000 (19:56 +0100)]
Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 8 Jan 2018 16:42:30 +0000 (17:42 +0100)]
Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle
David Monllao [Mon, 8 Jan 2018 16:19:12 +0000 (17:19 +0100)]
Merge branch 'MDL-57892_filter_outline' of git://github.com/davosmith/moodle
David Monllao [Mon, 8 Jan 2018 13:58:31 +0000 (14:58 +0100)]
Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 8 Jan 2018 09:13:06 +0000 (17:13 +0800)]
MDL-61169 iplookup: Change to github.com IP
Eloy Lafuente (stronk7) [Mon, 8 Jan 2018 09:05:39 +0000 (10:05 +0100)]
Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 8 Jan 2018 07:16:06 +0000 (15:16 +0800)]
Merge branch 'MDL-57786-master' of git://github.com/zig-moodle/moodle
Ankit Agarwal [Tue, 26 Dec 2017 05:05:00 +0000 (10:35 +0530)]
MDL-51885 lang: Remove strings deprecated in 3.1
Andrew Nicols [Mon, 8 Jan 2018 07:12:51 +0000 (15:12 +0800)]
Merge branch 'MDL-43042-master' of git://github.com/mihailges/moodle
Andrew Nicols [Mon, 8 Jan 2018 04:39:19 +0000 (12:39 +0800)]
Merge branch 'MDL-53985-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 20 Dec 2017 03:31:28 +0000 (11:31 +0800)]
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.
Mihail Geshoski [Fri, 5 Jan 2018 07:03:14 +0000 (15:03 +0800)]
MDL-43042 lesson: Confusing feedback order in multiple answer questions
Dan Marsden [Thu, 4 Jan 2018 21:21:12 +0000 (10:21 +1300)]
MDL-61050 auth_ldap: fix regression caused by MDL-42834
sam marshall [Fri, 1 Dec 2017 15:14:55 +0000 (15:14 +0000)]
MDL-60943 core_search: Improve exception for preg_replace errors
Helen Foster [Thu, 4 Jan 2018 10:30:54 +0000 (11:30 +0100)]
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
David Monllao [Thu, 4 Jan 2018 10:02:34 +0000 (11:02 +0100)]
weekly release 3.5dev
David Monllao [Thu, 4 Jan 2018 10:02:33 +0000 (11:02 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 4 Jan 2018 06:52:57 +0000 (14:52 +0800)]
MDL-60742 calendar: allow customisation of 12/24h time format strings
Jun Pataleta [Thu, 4 Jan 2018 06:57:32 +0000 (14:57 +0800)]
Merge branch 'MDL-40613-master-ldap' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 4 Jan 2018 06:30:48 +0000 (14:30 +0800)]
MDL-40613 auth_ldap: Call update_user_record on create
Jun Pataleta [Thu, 4 Jan 2018 01:57:38 +0000 (09:57 +0800)]
Merge branch 'MDL-40613_master-fix' of git://github.com/markn86/moodle
AMOS bot [Thu, 4 Jan 2018 00:06:51 +0000 (00:06 +0000)]
Automatically generated installer lang files
Davo Smith [Tue, 19 Dec 2017 10:48:46 +0000 (10:48 +0000)]
MDL-61061 formslib: make sure hideIf rules hide labels within groups
Davo Smith [Tue, 28 Nov 2017 10:16:25 +0000 (10:16 +0000)]
MDL-57892 report_outline: add behat tests
Davo Smith [Tue, 28 Nov 2017 08:54:46 +0000 (08:54 +0000)]
MDL-57892 report_outline: add date filter
Davo Smith [Wed, 6 Dec 2017 09:33:44 +0000 (09:33 +0000)]
MDL-60427 dndupload: detect attempts to upload folders
Mark Nelson [Wed, 3 Jan 2018 09:16:05 +0000 (17:16 +0800)]
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().
Jun Pataleta [Wed, 3 Jan 2018 08:53:49 +0000 (16:53 +0800)]
Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle
Jun Pataleta [Wed, 3 Jan 2018 01:26:12 +0000 (09:26 +0800)]
Merge branch 'MDL-56543-master' of git://github.com/ankitagarwal/moodle
AMOS bot [Wed, 3 Jan 2018 00:06:15 +0000 (00:06 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 2 Jan 2018 23:24:41 +0000 (00:24 +0100)]
Merge branch 'MDL-23887-master-2' of https://github.com/snake/moodle
David Monllao [Tue, 2 Jan 2018 11:33:40 +0000 (12:33 +0100)]
Merge branch 'MDL-57727-master' of git://github.com/mihailges/moodle
Jake Dallimore [Fri, 8 Dec 2017 03:55:28 +0000 (11:55 +0800)]
MDL-23887 database: fix use of deprecated system tables for mssql
Catalog views are available which we should use instead.
Jun Pataleta [Tue, 2 Jan 2018 08:50:29 +0000 (16:50 +0800)]
Merge branch 'MDL-40613_master' of git://github.com/markn86/moodle
David Monllao [Tue, 2 Jan 2018 08:03:03 +0000 (09:03 +0100)]
Merge branch 'MDL-59813-master' of git://github.com/farhan6318/moodle
David Monllao [Tue, 2 Jan 2018 07:34:39 +0000 (08:34 +0100)]
Merge branch 'MDL-61107' of git://github.com/timhunt/moodle
Zig Tan [Tue, 2 Jan 2018 05:10:37 +0000 (13:10 +0800)]
MDL-57786 mod_assign: Fix word count for online text submissions
Jun Pataleta [Tue, 2 Jan 2018 02:09:45 +0000 (10:09 +0800)]
Merge branch 'MDL-56945-master' of git://github.com/zig-moodle/moodle
Farhan Karmali [Fri, 29 Dec 2017 09:10:55 +0000 (14:40 +0530)]
MDL-59813 navigation: Changed 'more..' link to point to dashboard
In the navigation menu , the 'more' option was previously taking the user to all course page
This patch fixes that behavior and takes the user to the dashboard
Zig Tan [Fri, 29 Dec 2017 01:47:40 +0000 (09:47 +0800)]
MDL-56945 assign: Add 'View all submissions' link to PDF feedback/grader
David Monllao [Thu, 28 Dec 2017 11:35:12 +0000 (12:35 +0100)]
weekly release 3.5dev
David Monllao [Thu, 28 Dec 2017 09:15:08 +0000 (10:15 +0100)]
MDL-51089 mod_quiz: Hide first page last node
Ankit Agarwal [Thu, 16 Nov 2017 05:03:07 +0000 (10:33 +0530)]
MDL-56543 tasks: Add last run column to task list
David Monllao [Wed, 27 Dec 2017 05:45:39 +0000 (06:45 +0100)]
MDL-50246 question: enable/disable add question button when available
Eloy Lafuente (stronk7) [Tue, 26 Dec 2017 23:41:39 +0000 (00:41 +0100)]
Merge branch 'MDL-60363-master' of https://github.com/Kathrin84/moodle
Eloy Lafuente (stronk7) [Tue, 26 Dec 2017 23:36:00 +0000 (00:36 +0100)]
Merge branch 'MDL-60966-master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 26 Dec 2017 23:28:54 +0000 (00:28 +0100)]
Merge branch 'MDL-60981-master' of https://github.com/sammarshallou/moodle
David Monllao [Tue, 26 Dec 2017 16:13:54 +0000 (17:13 +0100)]
Merge branch 'MDL-50246-master' of https://github.com/lucaboesch/moodle
David Monllao [Tue, 26 Dec 2017 15:43:59 +0000 (16:43 +0100)]
Merge branch 'MDL-51089-master' of https://github.com/lucaboesch/moodle
David Monllao [Tue, 26 Dec 2017 13:00:48 +0000 (14:00 +0100)]
Merge branch 'MDL-58983-master' of git://github.com/damyon/moodle
David Monllao [Tue, 26 Dec 2017 12:11:33 +0000 (13:11 +0100)]
Merge branch 'MDL-61056-master-feedbackresponsenav' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 26 Dec 2017 09:29:47 +0000 (10:29 +0100)]
Merge branch 'MDL-33886-master' of git://github.com/zig-moodle/moodle
David Monllao [Tue, 26 Dec 2017 09:18:58 +0000 (10:18 +0100)]
MDL-60439 block_tags: Removing extra var assign
David Monllao [Tue, 26 Dec 2017 09:17:40 +0000 (10:17 +0100)]
Merge branch 'MDL-60439-master' of https://github.com/lucaboesch/moodle
David Monllao [Tue, 26 Dec 2017 09:03:28 +0000 (10:03 +0100)]
Merge branch 'MDL-60971-master' of git://github.com/mihailges/moodle
David Monllao [Tue, 26 Dec 2017 08:44:44 +0000 (09:44 +0100)]
Merge branch 'MDL-60942-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 26 Dec 2017 08:10:24 +0000 (09:10 +0100)]
Merge branch 'MDL-60359-master' of https://github.com/lucaboesch/moodle
Eloy Lafuente (stronk7) [Tue, 26 Dec 2017 00:25:14 +0000 (01:25 +0100)]
Merge branch 'MDL-2051-master-2' of git://github.com/junpataleta/moodle
