moodle.git
8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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.

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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.

8 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

8 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

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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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.

8 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.

8 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.

8 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

8 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.

8 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

8 years agoMDL-57338 templates: Fix modal_cancel template name
David Monllao [Wed, 4 Jan 2017 04:47:58 +0000 (05:47 +0100)]
MDL-57338 templates: Fix modal_cancel template name

8 years agoMDL-57536 availability: Fixed css for clean theme
Rajesh Taneja [Wed, 4 Jan 2017 00:59:40 +0000 (08:59 +0800)]
MDL-57536 availability: Fixed css for clean theme

8 years agoMerge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 3 Jan 2017 18:07:12 +0000 (18:07 +0000)]
Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle

8 years agoMDL-56992 core_scss: Don't allow invalid files to be included
Ankit Agarwal [Thu, 8 Dec 2016 06:03:55 +0000 (11:33 +0530)]
MDL-56992 core_scss: Don't allow invalid files to be included

We allow only .scss files so allow files to be included only and only if they end in .scss and they exist on server under theme directory.

8 years agoMDL-56225 mod_forum: Remove unnecessary attributes from update
Andrew Nicols [Fri, 7 Oct 2016 02:56:29 +0000 (10:56 +0800)]
MDL-56225 mod_forum: Remove unnecessary attributes from update

8 years agoMDL-49557 mod_scorm: optionally strip quotes.
Dan Marsden [Wed, 4 Jan 2017 02:43:46 +0000 (15:43 +1300)]
MDL-49557 mod_scorm: optionally strip quotes.

8 years agoMDL-57192 dml: Temporarily disable query logging during setup
Ankit Agarwal [Wed, 21 Dec 2016 08:24:56 +0000 (13:54 +0530)]
MDL-57192 dml: Temporarily disable query logging during setup

8 years agoMDL-57192 dml: Support temporarily disabling query logs during setup
Ankit Agarwal [Wed, 21 Dec 2016 08:24:22 +0000 (13:54 +0530)]
MDL-57192 dml: Support temporarily disabling query logs during setup

8 years agoMerge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Jan 2017 08:16:22 +0000 (08:16 +0000)]
Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-52168 behat: Select iframe in which text needs to be checked
Rajesh Taneja [Tue, 3 Jan 2017 07:14:04 +0000 (15:14 +0800)]
MDL-52168 behat: Select iframe in which text needs to be checked

8 years agoMerge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2017 01:34:58 +0000 (02:34 +0100)]
Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-56519 behat: Fixed lint errors
Rajesh Taneja [Fri, 23 Dec 2016 03:28:46 +0000 (11:28 +0800)]
MDL-56519 behat: Fixed lint errors

8 years agoMDL-56519 behat: Re-organize rules matching order
Rajesh Taneja [Fri, 23 Dec 2016 03:28:08 +0000 (11:28 +0800)]
MDL-56519 behat: Re-organize rules matching order

re-ordered rules to match gherkin-lint readme
https://github.com/vsiakka/gherkin-lint#available-rules

8 years agoMDL-56519 behat: Lint gherkin files
Dan Poltawski [Thu, 20 Oct 2016 09:53:05 +0000 (10:53 +0100)]
MDL-56519 behat: Lint gherkin files

8 years agoMDL-55042 phpunit: Get sorted sections
Rajesh Taneja [Mon, 2 Jan 2017 22:52:03 +0000 (06:52 +0800)]
MDL-55042 phpunit: Get sorted sections

Sometimes db doesn't return records in order
So enusre it is in order so that last record
doesn't have section equal 0. As section 0
can't be deleted.

8 years agoMerge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)]
Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-57536-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 17:59:16 +0000 (18:59 +0100)]
Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle

8 years agoMDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS
Juan Leyva [Mon, 26 Dec 2016 17:06:15 +0000 (18:06 +0100)]
MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS

8 years agoMDL-57536 availability: Document required selectors changes
Juan Leyva [Wed, 28 Dec 2016 10:58:46 +0000 (11:58 +0100)]
MDL-57536 availability: Document required selectors changes

MDL-55839 Introduced some changes in CSS selectors used by the form.js
file.

This caused contributed plugins to not work (javascript stop working)
when editing a module.

8 years agoMerge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 15:42:41 +0000 (16:42 +0100)]
Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle

8 years agoMerge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:35:11 +0000 (12:35 +0000)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)]
Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-57080-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:15:01 +0000 (12:15 +0000)]
Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle

8 years agoMerge branch 'MDL-57395-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:46:44 +0000 (11:46 +0000)]
Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle

8 years agoMerge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)]
Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle

8 years agoMDL-57532 calendar: tidy up button grouping
Dan Poltawski [Mon, 2 Jan 2017 10:44:35 +0000 (10:44 +0000)]
MDL-57532 calendar: tidy up button grouping

8 years agoMerge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)]
Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle

8 years agoMerge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle
David Monllao [Fri, 30 Dec 2016 08:59:45 +0000 (09:59 +0100)]
Merge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle

8 years agoMDL-56926 theme_boost: Restore filepicker's filename and icons original spacing
David Monllao [Thu, 29 Dec 2016 07:38:43 +0000 (08:38 +0100)]
MDL-56926 theme_boost: Restore filepicker's filename and icons original spacing

8 years agoMDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides
Nadav Kavalerchik [Wed, 28 Dec 2016 22:08:54 +0000 (00:08 +0200)]
MDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 29 Dec 2016 16:05:07 +0000 (00:05 +0800)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)]
Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle

8 years agoMerge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 29 Dec 2016 11:46:47 +0000 (11:46 +0000)]
Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle

8 years agoMDL-57512 categories: Use maxcategorydepth only when getting all cats
Pau Ferrer Ocaña [Thu, 22 Dec 2016 11:59:55 +0000 (12:59 +0100)]
MDL-57512 categories: Use maxcategorydepth only when getting all cats

8 years agoMerge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 09:44:01 +0000 (10:44 +0100)]
Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-57338 templates: fix missing example variables
Dan Poltawski [Thu, 29 Dec 2016 08:03:47 +0000 (08:03 +0000)]
MDL-57338 templates: fix missing example variables

From Davids review, thanks

8 years agoMDL-57471 forms: Removing unresolved conflict line
David Monllao [Thu, 29 Dec 2016 07:54:36 +0000 (08:54 +0100)]
MDL-57471 forms: Removing unresolved conflict line

8 years agoMerge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 07:43:37 +0000 (08:43 +0100)]
Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-57331-master' of https://github.com/xow/moodle
David Monllao [Wed, 28 Dec 2016 21:07:12 +0000 (22:07 +0100)]
Merge branch 'MDL-57331-master' of https://github.com/xow/moodle

8 years agoMerge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:20:04 +0000 (15:20 +0000)]
Merge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle

8 years agoMerge branch 'MDL-55955_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:11:56 +0000 (15:11 +0000)]
Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:06:03 +0000 (15:06 +0000)]
Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle
David Monllao [Wed, 28 Dec 2016 12:53:19 +0000 (13:53 +0100)]
Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle

8 years agoMerge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 12:37:19 +0000 (13:37 +0100)]
Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-57417-master' of https://github.com/snake/moodle
Dan Poltawski [Wed, 28 Dec 2016 12:17:15 +0000 (12:17 +0000)]
Merge branch 'MDL-57417-master' of https://github.com/snake/moodle

8 years agoMerge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 28 Dec 2016 11:22:52 +0000 (12:22 +0100)]
Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 10:45:34 +0000 (11:45 +0100)]
Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 10:30:51 +0000 (10:30 +0000)]
Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle

8 years agoMDL-57395 course: New Web Service core_course_get_updates_since
Juan Leyva [Wed, 28 Dec 2016 10:24:40 +0000 (11:24 +0100)]
MDL-57395 course: New Web Service core_course_get_updates_since

8 years agoMerge branch 'MDL-57357-master' of https://github.com/snake/moodle
David Monllao [Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)]
Merge branch 'MDL-57357-master' of https://github.com/snake/moodle

8 years agoMerge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 09:58:13 +0000 (10:58 +0100)]
Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 09:13:29 +0000 (09:13 +0000)]
Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 28 Dec 2016 08:56:12 +0000 (08:56 +0000)]
Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle

8 years agoMDL-52168 mod_scorm: Fix issue when scorm does not define org.
Dan Marsden [Mon, 16 Nov 2015 16:54:45 +0000 (16:54 +0000)]
MDL-52168 mod_scorm: Fix issue when scorm does not define org.

8 years agoMDL-57392 course: Return course filters status via WS
Juan Leyva [Tue, 27 Dec 2016 08:21:02 +0000 (09:21 +0100)]
MDL-57392 course: Return course filters status via WS

Return active filters in core_course_get_courses_by_field

8 years agoMDL-57373 navigation: Fix course names in flat nav
Ankit Agarwal [Tue, 27 Dec 2016 06:27:02 +0000 (11:57 +0530)]
MDL-57373 navigation: Fix course names in flat nav