moodle.git
4 years agoMerge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
Andrew Nicols [Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)]
Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle

4 years agoMerge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 18 Jan 2017 04:09:20 +0000 (12:09 +0800)]
Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward...
Andrew Nicols [Wed, 18 Jan 2017 00:36:58 +0000 (08:36 +0800)]
Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward/moodle

4 years agoMerge branch 'MDL-57570-master' of https://github.com/mwehr/moodle
Eloy Lafuente (stronk7) [Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)]
Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle

4 years agoMerge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 23:16:53 +0000 (00:16 +0100)]
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)]
Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle

4 years agoMerge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 23:00:13 +0000 (00:00 +0100)]
Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57629-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:55:05 +0000 (20:55 +0100)]
Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-57409-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)]
Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)]
Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)]
Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)]
Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle

4 years agoMerge branch 'MDL-50542-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)]
Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-50549-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 17 Jan 2017 06:52:07 +0000 (06:52 +0000)]
Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle

4 years agoMDL-57669 behat: Exit with error code if step undefined
Rajesh Taneja [Tue, 17 Jan 2017 02:30:45 +0000 (10:30 +0800)]
MDL-57669 behat: Exit with error code if step undefined

4 years agoMerge branch 'MDL-57368-master-2' of https://github.com/snake/moodle
Dan Poltawski [Mon, 16 Jan 2017 16:20:05 +0000 (16:20 +0000)]
Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-57613-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)]
Merge branch 'MDL-57613-master' of https://github.com/xow/moodle

4 years agoMDL-57590 mod_forum: fixed search form with forumid and actionurl.
Mike Churchward [Wed, 11 Jan 2017 15:11:37 +0000 (10:11 -0500)]
MDL-57590 mod_forum: fixed search form with forumid and actionurl.

4 years agoMDL-42266 Lib: Allow additional max upload file sizes
Stephen Bourget [Mon, 16 Jan 2017 15:54:33 +0000 (10:54 -0500)]
MDL-42266 Lib: Allow additional max upload file sizes

4 years agoMerge branch 'MDL-57452_behat_completion_fix_master' of https://github.com/gthomas2...
Dan Poltawski [Mon, 16 Jan 2017 13:34:06 +0000 (13:34 +0000)]
Merge branch 'MDL-57452_behat_completion_fix_master' of https://github.com/gthomas2/moodle

4 years agoMDL-57490 javascript-static: remove legacy functions
Dan Poltawski [Wed, 21 Dec 2016 13:38:50 +0000 (13:38 +0000)]
MDL-57490 javascript-static: remove legacy functions

1) Some previous deprecations are removed to reduce the amount of
 code sent to the client
2) Other very-old functions are also sent to final deprecation

This is more agressive than our standard deprecation process, but with
the nature of this old js it seems the best way forward to reduce the
amount of obsolete js sent to clients.

4 years agoMDL-57490 lesson: convert legacy js to jquery
Dan Poltawski [Wed, 21 Dec 2016 16:19:15 +0000 (16:19 +0000)]
MDL-57490 lesson: convert legacy js to jquery

4 years agoMDL-57490 scorm: convert legacy js to jquery
Dan Poltawski [Wed, 21 Dec 2016 16:07:31 +0000 (16:07 +0000)]
MDL-57490 scorm: convert legacy js to jquery

4 years agoMDL-57490 quiz: convert legacy js to jquery
Dan Poltawski [Wed, 21 Dec 2016 15:53:23 +0000 (15:53 +0000)]
MDL-57490 quiz: convert legacy js to jquery

4 years agoMerge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)]
Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle

4 years agoMerge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle
Dan Poltawski [Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)]
Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle

4 years agoMerge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Mon, 16 Jan 2017 11:17:58 +0000 (11:17 +0000)]
Merge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle

4 years agoMerge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)]
Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle

4 years agoMerge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)]
Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle

4 years agoMerge branch 'wip-mdl-57659' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 16 Jan 2017 08:09:53 +0000 (09:09 +0100)]
Merge branch 'wip-mdl-57659' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:01:23 +0000 (08:01 +0000)]
Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-57659 cache: Set default serializer to SERIALIZER_PHP
Rajesh Taneja [Mon, 16 Jan 2017 06:35:53 +0000 (14:35 +0800)]
MDL-57659 cache: Set default serializer to SERIALIZER_PHP

4 years agoMDL-57488 js: remove M.util.focus_login_form/error
Dan Poltawski [Wed, 21 Dec 2016 11:09:48 +0000 (11:09 +0000)]
MDL-57488 js: remove M.util.focus_login_form/error

These are replaced by some simple jquery instead.

4 years agoMDL-57554 forum: Mark as read on view_forum_discussion calls
Pau Ferrer Ocaña [Mon, 2 Jan 2017 12:00:35 +0000 (13:00 +0100)]
MDL-57554 forum: Mark as read on view_forum_discussion calls

4 years agoMDL-57627 forum: Return if the user is tracking forum
Pau Ferrer Ocaña [Wed, 11 Jan 2017 12:34:10 +0000 (13:34 +0100)]
MDL-57627 forum: Return if the user is tracking forum

4 years agoMDL-57613 enrol_lti: Allow longer nonces
John Okely [Fri, 13 Jan 2017 02:52:24 +0000 (10:52 +0800)]
MDL-57613 enrol_lti: Allow longer nonces

4 years agoMDL-57374 editor: Pasting plain text in Atto removes all styles/classes
David Bogner [Tue, 13 Dec 2016 14:04:13 +0000 (15:04 +0100)]
MDL-57374 editor: Pasting plain text in Atto removes all styles/classes

4 years agoMDL-57634 messaging: Ensure test uses a configured plugin
Michael Aherne [Thu, 12 Jan 2017 12:30:39 +0000 (12:30 +0000)]
MDL-57634 messaging: Ensure test uses a configured plugin

4 years agoMDL-57452 behat: Make completion check work with manual completion input
gthomas2 [Mon, 19 Dec 2016 13:00:22 +0000 (13:00 +0000)]
MDL-57452 behat: Make completion check work with manual completion input

4 years agoweekly release 3.3dev
Dan Poltawski [Thu, 12 Jan 2017 07:42:26 +0000 (07:42 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 12 Jan 2017 07:42:24 +0000 (07:42 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-57368 mod_feeback: fix drag and drop question reordering in boost
Jake Dallimore [Thu, 12 Jan 2017 01:56:09 +0000 (09:56 +0800)]
MDL-57368 mod_feeback: fix drag and drop question reordering in boost

4 years agoMDL-57368 templates: add example context to core_form/element-template
Jake Dallimore [Thu, 12 Jan 2017 01:54:40 +0000 (09:54 +0800)]
MDL-57368 templates: add example context to core_form/element-template

4 years agoMDL-57608 media_videojs: lazily load videojs on demand
Dan Poltawski [Wed, 11 Jan 2017 09:50:03 +0000 (09:50 +0000)]
MDL-57608 media_videojs: lazily load videojs on demand

The videojs javascript is over 1MB of javascript which we don't need to
load on every page, now that we only require it demand, the js can be
lazily loaded when its needed, which keeps the first.js smaller and more
likely to stay in browser cache.

4 years agoMDL-57608 media_videojs: fix third party locations
Dan Poltawski [Wed, 11 Jan 2017 10:03:39 +0000 (10:03 +0000)]
MDL-57608 media_videojs: fix third party locations

4 years agoMDL-57608 media_videojs: load youtube module only when requested
Marina Glancy [Wed, 11 Jan 2017 06:13:56 +0000 (14:13 +0800)]
MDL-57608 media_videojs: load youtube module only when requested

4 years agoMDL-57570 cache: Adds igbinary serializer to static cache store
wehr [Thu, 5 Jan 2017 16:48:30 +0000 (17:48 +0100)]
MDL-57570 cache: Adds igbinary serializer to static cache store

4 years agoMDL-57629 webservice: Fix external functions phpdoc
Juan Leyva [Wed, 11 Jan 2017 15:56:25 +0000 (16:56 +0100)]
MDL-57629 webservice: Fix external functions phpdoc

Replace external_external_function_parameters with
external_function_parameters

4 years agoMDL-50542 mod_label: New WS mod_label_get_labels_by_courses
Juan Leyva [Tue, 3 Jan 2017 10:59:51 +0000 (11:59 +0100)]
MDL-50542 mod_label: New WS mod_label_get_labels_by_courses

4 years agoMDL-50549 mod_url: New WS mod_url_get_urls_by_courses
Juan Leyva [Tue, 3 Jan 2017 10:40:44 +0000 (11:40 +0100)]
MDL-50549 mod_url: New WS mod_url_get_urls_by_courses

4 years agoMerge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 11 Jan 2017 01:42:29 +0000 (02:42 +0100)]
Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 11 Jan 2017 01:29:49 +0000 (02:29 +0100)]
Merge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57572 redis: Prevent installation to fail on sites without redis
Eloy Lafuente (stronk7) [Wed, 11 Jan 2017 01:22:48 +0000 (02:22 +0100)]
MDL-57572 redis: Prevent installation to fail on sites without redis

4 years agoMerge branch 'MDL-57572-master' of https://github.com/mwehr/moodle
Eloy Lafuente (stronk7) [Tue, 10 Jan 2017 18:25:44 +0000 (19:25 +0100)]
Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle

4 years agoMDL-57515 Resource: 'not very efficient' with a large number of files
sam marshall [Thu, 22 Dec 2016 15:31:25 +0000 (15:31 +0000)]
MDL-57515 Resource: 'not very efficient' with a large number of files

Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)

4 years agoMerge branch 'MDL-57282-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 10 Jan 2017 11:38:14 +0000 (12:38 +0100)]
Merge branch 'MDL-57282-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-57480-master' of https://github.com/snake/moodle
Dan Poltawski [Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)]
Merge branch 'MDL-57480-master' of https://github.com/snake/moodle

4 years agoMDL-56271 mod_feedback: recaptcha was not working
Marina Glancy [Tue, 10 Jan 2017 06:08:04 +0000 (14:08 +0800)]
MDL-56271 mod_feedback: recaptcha was not working

4 years agoMerge branch 'MDL-57149-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 10 Jan 2017 05:23:03 +0000 (06:23 +0100)]
Merge branch 'MDL-57149-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-57385-master-2' of git://github.com/junpataleta/moodle
David Monllao [Tue, 10 Jan 2017 04:26:37 +0000 (05:26 +0100)]
Merge branch 'MDL-57385-master-2' of git://github.com/junpataleta/moodle

4 years agoMDL-57149 admin: Make langimport page Bootstrap-compatible
Jun Pataleta [Fri, 2 Dec 2016 08:59:09 +0000 (16:59 +0800)]
MDL-57149 admin: Make langimport page Bootstrap-compatible

* Create template for the language import page.
* Apply Bootstrap classes to form elements.
* Use core notifications for displaying error/success messages.

4 years agoMDL-57385 core: Set page layouts of non-mydashboard pages to standard
Jun Pataleta [Tue, 6 Dec 2016 08:44:40 +0000 (16:44 +0800)]
MDL-57385 core: Set page layouts of non-mydashboard pages to standard

The following pages are using the "mydashboard" page layout:
* User preferences > Badges > Manage badges
* User preferences > Badges > Backpack settings
* User preferences > Repositories > Manage instances
* Private files
However, the "mydashboard" page layout should only be used for the user's
dashboard page. Changing these to use the "standard" page layout.

4 years agoMDL-57480 core_course: make drag and drop fire a dom updated event
Jake Dallimore [Wed, 21 Dec 2016 03:46:04 +0000 (11:46 +0800)]
MDL-57480 core_course: make drag and drop fire a dom updated event

When adding media via drag and drop, the notifyFilterContentUpdated
event should be called after the item is added to the DOM. This allows
things like videojs for example, to process the new content.

4 years agoMDL-57604 mod_assign: fix incorrect user being selector from chooser
Dan Poltawski [Mon, 9 Jan 2017 20:18:50 +0000 (20:18 +0000)]
MDL-57604 mod_assign: fix incorrect user being selector from chooser

Previously there was a logic bug where by if some students were filtered
from the list, the label for another student could be attached to the
'filered' student.

This fix reworks the promises a bit so we render the student summary and
then build an row with the explict user id, rather than itterating through
the array later.

I also remove the storing of the initial promise in a varible because
this is an easy way to introduce a bug (not waiting for the .then()
chained promise)

4 years agoMerge branch 'MDL-57427' of https://github.com/jrchamp/moodle
Dan Poltawski [Mon, 9 Jan 2017 16:25:15 +0000 (16:25 +0000)]
Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle

4 years agoMDL-57601 Grade report: Error for ungraded quiz without view hidden
sam marshall [Mon, 9 Jan 2017 14:24:11 +0000 (14:24 +0000)]
MDL-57601 Grade report: Error for ungraded quiz without view hidden

If a course contains an ungraded quiz (max grade set to 0), and there
is a user account which can view the grader reports but does not have
permission to view hidden grades, they will get errors.

4 years agoMDL-57427 cache: Use perfdebug only when enabled
Jonathan Champ [Fri, 16 Dec 2016 17:20:45 +0000 (12:20 -0500)]
MDL-57427 cache: Use perfdebug only when enabled

4 years agoMerge branch 'MDL-57392-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 9 Jan 2017 12:40:14 +0000 (13:40 +0100)]
Merge branch 'MDL-57392-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'wip-mdl-55042' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 9 Jan 2017 11:54:16 +0000 (12:54 +0100)]
Merge branch 'wip-mdl-55042' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57409 tool_mobile: Return mobileapp settings in get_config WS
Juan Leyva [Tue, 27 Dec 2016 13:02:20 +0000 (14:02 +0100)]
MDL-57409 tool_mobile: Return mobileapp settings in get_config WS

4 years agoMDL-57409 tool_mobile: New forcelogout setting
Juan Leyva [Tue, 27 Dec 2016 12:57:27 +0000 (13:57 +0100)]
MDL-57409 tool_mobile: New forcelogout setting

4 years agoMerge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 9 Jan 2017 10:51:23 +0000 (10:51 +0000)]
Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle

4 years agoMerge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle
Dan Poltawski [Mon, 9 Jan 2017 10:23:11 +0000 (10:23 +0000)]
Merge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle

4 years agoMerge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 9 Jan 2017 09:58:57 +0000 (09:58 +0000)]
Merge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 9 Jan 2017 09:42:27 +0000 (09:42 +0000)]
Merge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-53367_master' of https://github.com/juancs/moodle
Dan Poltawski [Mon, 9 Jan 2017 08:27:18 +0000 (08:27 +0000)]
Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle

4 years agoMDL-45821 mod_scorm: Check lesson_status correctly for multi-sco.
Dan Marsden [Tue, 20 Dec 2016 08:13:23 +0000 (21:13 +1300)]
MDL-45821 mod_scorm: Check lesson_status correctly for multi-sco.

4 years agoMDL-57595 behat: Added redirect and wait to ensure next step pass
Rajesh Taneja [Mon, 9 Jan 2017 04:01:57 +0000 (12:01 +0800)]
MDL-57595 behat: Added redirect and wait to ensure next step pass

4 years agoAutomatically generated installer lang files
AMOS bot [Sat, 7 Jan 2017 16:04:47 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMDL-40132 lib: Using compare rule results in fatal error.
godric [Tue, 29 Nov 2016 07:49:21 +0000 (10:49 +0300)]
MDL-40132 lib: Using compare rule results in fatal error.

In getValidationScript function variable $element can be an array or object.
Function attempt get non-existing attributes.
To avoid this we should check before accessing.

4 years agoMDL-57572 cache: Adds igbinary serializer to Redis cache store
wehr [Thu, 5 Jan 2017 20:13:31 +0000 (21:13 +0100)]
MDL-57572 cache: Adds igbinary serializer to Redis cache store

4 years agoMDL-57282 behat: Deprecate I go to X in the course gradebook
John Okely [Fri, 6 Jan 2017 05:40:42 +0000 (13:40 +0800)]
MDL-57282 behat: Deprecate I go to X in the course gradebook

4 years agoweekly release 3.3dev
Dan Poltawski [Fri, 6 Jan 2017 01:30:49 +0000 (01:30 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 6 Jan 2017 01:30:48 +0000 (01:30 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-56211 behat: Add suite name to faildump path
Rajesh Taneja [Thu, 22 Dec 2016 05:03:20 +0000 (13:03 +0800)]
MDL-56211 behat: Add suite name to faildump path

If suite is not default then add suite name
to end of faildump file name

4 years agoMDL-57580 mod_assign: Fix the incorrect type of some input parameters
David Mudrák [Thu, 5 Jan 2017 12:20:59 +0000 (13:20 +0100)]
MDL-57580 mod_assign: Fix the incorrect type of some input parameters

The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.

4 years agoMerge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Thu, 5 Jan 2017 10:09:17 +0000 (10:09 +0000)]
Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMDL-56519 behat: Add gherkin lint to watch and startup
Rajesh Taneja [Tue, 3 Jan 2017 01:26:56 +0000 (09:26 +0800)]
MDL-56519 behat: Add gherkin lint to watch and startup

4 years agoMerge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 5 Jan 2017 06:51:54 +0000 (06:51 +0000)]
Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57531 behat: Set noreplyaddress to valid address
Rajesh Taneja [Thu, 5 Jan 2017 06:40:16 +0000 (14:40 +0800)]
MDL-57531 behat: Set noreplyaddress to valid address

noreplyaddress should be a valid address, else
it will not be saved. For behat we don't send
email, so set it to noreply@example.com, to
avoid failing validation on localhost

4 years agoMDL-57563 lang: Use the new newsitemsnumber wording in behat
David Mudrák [Wed, 4 Jan 2017 21:09:44 +0000 (22:09 +0100)]
MDL-57563 lang: Use the new newsitemsnumber wording in behat

4 years agoMDL-57563 lang: Merge English strings from the en_fix language pack
Helen Foster [Wed, 4 Jan 2017 21:03:08 +0000 (22:03 +0100)]
MDL-57563 lang: Merge English strings from the en_fix language pack

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 4 Jan 2017 16:04:57 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 4 Jan 2017 13:29:10 +0000 (13:29 +0000)]
Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle

4 years agoMDL-57531 mail: Make validate_email return actual boolean as expected
David Mudrák [Wed, 4 Jan 2017 12:13:31 +0000 (13:13 +0100)]
MDL-57531 mail: Make validate_email return actual boolean as expected

It was discovered by unit tests that the return value is not a real
boolean as was intuitively expected and documented. To avoid potential
issues with the truthyness in the future, we explicitly cast the return
value to boolean now.

4 years agoMDL-57531 mail: Validate the sender's email address
David Mudrák [Tue, 3 Jan 2017 21:09:30 +0000 (22:09 +0100)]
MDL-57531 mail: Validate the sender's email address

The patch adds validation for the noreplyaddress setting variable, for
the explicit $replyto parameter and for the sender's email. In case of
misconfigured noreplyaddress setting, it falls back to the default
noreply address value. In case of invalid email in the user's record,
the email is not sent.

The patch also adds unit test for the value returned by the function
generate_email_processing_address() so that it can be considered as a
valid email, too.

This is supposed to significantly minimise the risk of exploiting the
vulnerability in PHPMailer's Sender field.

4 years agoMDL-57531 mail: Do not let admins set invalid email addresses
David Mudrák [Tue, 3 Jan 2017 21:15:43 +0000 (22:15 +0100)]
MDL-57531 mail: Do not let admins set invalid email addresses

The noreply and support emails should always be valid.

4 years agoMerge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 4 Jan 2017 10:58:46 +0000 (11:58 +0100)]
Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle

4 years agoMDL-56225 mod_forum: Fix inability to edit attachments
David Mudrák [Wed, 4 Jan 2017 09:58:44 +0000 (10:58 +0100)]
MDL-56225 mod_forum: Fix inability to edit attachments

The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.

There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.

4 years agoMerge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
David Monllao [Wed, 4 Jan 2017 05:02:44 +0000 (06:02 +0100)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle