moodle.git
6 years agoMDL-52160 navigation: Mark category and module settings nodes as branch
Frederic Massart [Wed, 25 Nov 2015 05:03:25 +0000 (13:03 +0800)]
MDL-52160 navigation: Mark category and module settings nodes as branch

6 years agoMerge branch 'MDL-44330' of git://github.com/NeillM/moodle
David Monllao [Tue, 24 Nov 2015 09:03:06 +0000 (17:03 +0800)]
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle

6 years agoMerge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)]
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-44330 Assign: Assignment grading may not display expected student
Neill Magill [Wed, 11 Nov 2015 13:06:31 +0000 (13:06 +0000)]
MDL-44330 Assign: Assignment grading may not display expected student

Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:

1) The user had the table ordered by a value that could be modified,
   for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
   between the user generating the table and clicking on a grade link.

If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.

This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.

6 years agoMDL-50163 behat: wait to ensure elements are placed properly by js.
Rajesh Taneja [Tue, 24 Nov 2015 03:16:44 +0000 (11:16 +0800)]
MDL-50163 behat: wait to ensure elements are placed properly by js.

6 years agoMerge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)]
Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)]
Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)]
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-52166' of https://github.com/timhunt/moodle
Dan Poltawski [Mon, 23 Nov 2015 09:43:31 +0000 (09:43 +0000)]
Merge branch 'MDL-52166' of https://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 23 Nov 2015 09:00:24 +0000 (17:00 +0800)]
Merge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle

6 years agoMDL-52214 core: Fix case sensitivity in user agent comparison
David Mudrák [Thu, 19 Nov 2015 13:14:16 +0000 (14:14 +0100)]
MDL-52214 core: Fix case sensitivity in user agent comparison

The previous 2.9 implementation of is_web_crawler() used stripos() in
certain cases. The unit tests re-added in the previous commit revealed
that certain crawlers (such as BaiDuSpider) were not correctly detected
in the new refactored implementation.

It seems lesser evil and safe enough to use /i in the regex search even
though it is not 100% same logic as before - as stripos() was used in
some cases only, not always.

6 years agoMDL-52214 core: Fix the is_web_crawler() regression
David Mudrák [Thu, 19 Nov 2015 12:21:49 +0000 (13:21 +0100)]
MDL-52214 core: Fix the is_web_crawler() regression

In MDL-50891, the is_web_crawler() was refactored into a core_useragent
method and the function itself was deprecated. However, there were no
unit tests kept to check the backwards compatible behaviour. It turned
out that the deprecated function leads to PHP fatal error due to a typo.

This patch fixes the typo and brings back the previous unit tests. To be
able to explicitly check the raised debugging message, the test case
now must be subclass of advanced_testcase.

Additionally fixes missing info about the function being deprecated.

6 years agoMerge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)]
Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-52086' of git://github.com/bostelm/moodle
David Monllao [Mon, 23 Nov 2015 08:10:25 +0000 (16:10 +0800)]
Merge branch 'MDL-52086' of git://github.com/bostelm/moodle

6 years agoMerge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
David Monllao [Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)]
Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle

6 years agoMerge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 23 Nov 2015 06:07:21 +0000 (14:07 +0800)]
Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 05:56:06 +0000 (13:56 +0800)]
Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 05:32:35 +0000 (13:32 +0800)]
Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-37834 assign: avoid newlines in status column of csv
Dan Poltawski [Wed, 18 Nov 2015 16:45:31 +0000 (16:45 +0000)]
MDL-37834 assign: avoid newlines in status column of csv

Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.

6 years agoMDL-52095 themes: Padding to the left on RTL langs
David Monllao [Wed, 11 Nov 2015 07:35:56 +0000 (15:35 +0800)]
MDL-52095 themes: Padding to the left on RTL langs

6 years agoweekly on-sync release 3.1dev
Dan Poltawski [Thu, 19 Nov 2015 09:21:07 +0000 (09:21 +0000)]
weekly on-sync release 3.1dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 19 Nov 2015 09:21:04 +0000 (09:21 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Nov 2015 08:43:19 +0000 (09:43 +0100)]
Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)]
Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle

6 years agoMDL-42571 editpdf: Fix search comments
David Monllao [Thu, 19 Nov 2015 06:59:03 +0000 (14:59 +0800)]
MDL-42571 editpdf: Fix search comments

They are also hidden instead of destroyed.

6 years agoMerge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 19 Nov 2015 06:47:30 +0000 (06:47 +0000)]
Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 19 Nov 2015 06:33:54 +0000 (06:33 +0000)]
Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle

6 years agoMDL-42571 editpdf: Fix comments search and multiple views drawing
David Monllao [Thu, 19 Nov 2015 04:29:20 +0000 (12:29 +0800)]
MDL-42571 editpdf: Fix comments search and multiple views drawing

6 years agoMDL-52203 qtype_multianswer: avoid fatal error during upgrade
Marina Glancy [Thu, 19 Nov 2015 03:06:48 +0000 (11:06 +0800)]
MDL-52203 qtype_multianswer: avoid fatal error during upgrade

6 years agoMDL-52086 output renderers: show subtree only when tab is activated
Henning Bostelmann [Mon, 9 Nov 2015 23:22:53 +0000 (23:22 +0000)]
MDL-52086 output renderers: show subtree only when tab is activated

6 years agoAutomatically generated installer lang files
AMOS bot [Wed, 18 Nov 2015 16:04:45 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMDL-43069 assign: prevent JS error on grading table
Pavel Sokolov [Thu, 5 Dec 2013 13:00:34 +0000 (17:00 +0400)]
MDL-43069 assign: prevent JS error on grading table

Previously submission comments failed to expand if you hid
the file submissions column.

6 years agoMDL-45934 backup: do not reset completion enabled flag
Dan Poltawski [Wed, 18 Nov 2015 11:45:45 +0000 (11:45 +0000)]
MDL-45934 backup: do not reset completion enabled flag

The 'completion enabled' flag does not reflect any course data, its a
course setting. Previously when doing a backup deleteting existing
course content this was forced off when it should not have been.

6 years agoMDL-49490 assign: can't export to portfolio on non-submission
Dan Poltawski [Wed, 4 Nov 2015 14:10:40 +0000 (14:10 +0000)]
MDL-49490 assign: can't export to portfolio on non-submission

6 years agoMDL-52194 flowplayer: do not check request
Marina Glancy [Wed, 18 Nov 2015 07:26:18 +0000 (15:26 +0800)]
MDL-52194 flowplayer: do not check request

$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085

6 years agoMDL-52162 question: Removing unnecessary dependency
David Monllao [Wed, 18 Nov 2015 05:15:46 +0000 (13:15 +0800)]
MDL-52162 question: Removing unnecessary dependency

APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.

Credit to Marina Glancy.

6 years agoMDL-52029 installer: Unstyled installer if display_errors is on
Vadim Dvorovenko [Wed, 18 Nov 2015 01:44:04 +0000 (08:44 +0700)]
MDL-52029 installer: Unstyled installer if display_errors is on

Error in MDL-43839 solution caused inclusion of unexistent file in
install/css.php.

6 years agoMerge branch 'MDL-52140' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 17 Nov 2015 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-52140' of git://github.com/stronk7/moodle

6 years agoMDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
Eloy Lafuente (stronk7) [Tue, 17 Nov 2015 16:08:56 +0000 (17:08 +0100)]
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts

6 years agoMDL-52185 report: remove ugly bullet points
Dan Poltawski [Tue, 17 Nov 2015 15:32:12 +0000 (15:32 +0000)]
MDL-52185 report: remove ugly bullet points

6 years agoMDL-52180 travis: remove weekly release checker
Dan Poltawski [Tue, 17 Nov 2015 09:39:44 +0000 (09:39 +0000)]
MDL-52180 travis: remove weekly release checker

To prevent false positives

6 years agoMDL-50163 behat: Return subcontext from session
Rajesh Taneja [Tue, 17 Nov 2015 04:59:06 +0000 (12:59 +0800)]
MDL-50163 behat: Return subcontext from session

Creating a new context with new mink context
with different session was keeping the session
and was not returning proper session information

6 years agoMDL-50163 behat: Restart session after scenario with switch_window
rajesh Taneja [Thu, 22 Oct 2015 03:35:00 +0000 (11:35 +0800)]
MDL-50163 behat: Restart session after scenario with switch_window

Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window

6 years agoMerge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Nov 2015 02:20:59 +0000 (10:20 +0800)]
Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-50700 gradereport_overview: Call $PAGE->set_course
Russell Smith [Mon, 16 Nov 2015 01:14:43 +0000 (12:14 +1100)]
MDL-50700 gradereport_overview: Call $PAGE->set_course

To ensure correct blocks are displayed.

6 years agoMerge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)]
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 16 Nov 2015 16:21:17 +0000 (16:21 +0000)]
Merge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle

6 years agoAutomatically generated installer lang files
AMOS bot [Mon, 16 Nov 2015 16:05:09 +0000 (00:05 +0800)]
Automatically generated installer lang files

6 years agoMDL-52166 gradebook: overview report fails with separate groups
Tim Hunt [Mon, 16 Nov 2015 14:37:42 +0000 (14:37 +0000)]
MDL-52166 gradebook: overview report fails with separate groups

6 years agoMDL-52160 navigation: Really remove module settings empty nodes
Frederic Massart [Mon, 16 Nov 2015 11:28:06 +0000 (19:28 +0800)]
MDL-52160 navigation: Really remove module settings empty nodes

6 years agoMerge branch 'MDL-52139' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 16 Nov 2015 09:28:37 +0000 (09:28 +0000)]
Merge branch 'MDL-52139' of git://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 07:25:42 +0000 (15:25 +0800)]
Merge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
David Monllao [Mon, 16 Nov 2015 06:54:19 +0000 (14:54 +0800)]
Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle

6 years agoMerge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 06:25:48 +0000 (14:25 +0800)]
Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 16 Nov 2015 06:19:18 +0000 (14:19 +0800)]
Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-42571' of git://github.com/blaky/moodle
David Monllao [Mon, 16 Nov 2015 05:39:59 +0000 (13:39 +0800)]
Merge branch 'MDL-42571' of git://github.com/blaky/moodle

Conflicts:
mod/assign/feedback/editpdf/version.php

6 years agoMDL-52139 backup: Bump release to 3.1
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 23:39:17 +0000 (00:39 +0100)]
MDL-52139 backup: Bump release to 3.1

6 years agoweekly back-to-dev release 3.1dev
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 22:23:46 +0000 (23:23 +0100)]
weekly back-to-dev release 3.1dev

6 years agoChange travis.yml back to master
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:56 +0000 (18:44 +0100)]
Change travis.yml back to master

6 years agoMoodle release 3.0 v3.0.0
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:55 +0000 (18:44 +0100)]
Moodle release 3.0

6 years agoChange travis.yml to MOODLE_30_STABLE
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:55 +0000 (18:44 +0100)]
Change travis.yml to MOODLE_30_STABLE

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:47 +0000 (18:44 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-52126' of git://github.com/stronk7/moodle
Dan Poltawski [Sun, 15 Nov 2015 16:05:33 +0000 (16:05 +0000)]
Merge branch 'MDL-52126' of git://github.com/stronk7/moodle

6 years agoAutomatically generated installer lang files
AMOS bot [Sun, 15 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMDL-52126 forum: Verify forum mailout contents
Eloy Lafuente (stronk7) [Sat, 14 Nov 2015 19:06:03 +0000 (20:06 +0100)]
MDL-52126 forum: Verify forum mailout contents

New unit test able to verify mail contents
configured by provider do match all expectations defined.

6 years agoMDL-52126 forum: Correct over-escaping of html-based emails
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 09:33:19 +0000 (10:33 +0100)]
MDL-52126 forum: Correct over-escaping of html-based emails

6 years agoMDL-52126 forum: Correct over-escaping of text-based emails
Andrew Nicols [Fri, 13 Nov 2015 14:17:20 +0000 (22:17 +0800)]
MDL-52126 forum: Correct over-escaping of text-based emails

6 years agoAutomatically generated installer lang files
AMOS bot [Sat, 14 Nov 2015 16:04:05 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMDL-41643 datafield_checkbox: Add line breaks behind checkbox options.
Johannes Burk [Thu, 29 Oct 2015 10:47:48 +0000 (11:47 +0100)]
MDL-41643 datafield_checkbox: Add line breaks behind checkbox options.

Add line a break behind each checkbox option in advanced search.

6 years agoMDL-50564 atto: Require atto_menu in atto_plugin
Frederic Massart [Thu, 12 Nov 2015 17:34:18 +0000 (11:34 -0600)]
MDL-50564 atto: Require atto_menu in atto_plugin

6 years agoAutomatically generated installer lang files
AMOS bot [Fri, 13 Nov 2015 16:06:20 +0000 (00:06 +0800)]
Automatically generated installer lang files

6 years agoMDL-52021 enrollib: Removed repeated capability
Syam Mohan [Thu, 29 Oct 2015 05:13:23 +0000 (10:43 +0530)]
MDL-52021 enrollib: Removed repeated capability

'moodle/role:assign' replicated in the permission checking

6 years agoMoodle release 3.0rc4 v3.0.0-rc4
David Monllao [Fri, 13 Nov 2015 07:28:19 +0000 (15:28 +0800)]
Moodle release 3.0rc4

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Fri, 13 Nov 2015 07:28:16 +0000 (15:28 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-50687 phpunit: error early if required locale not installed
Dan Poltawski [Fri, 30 Oct 2015 11:40:33 +0000 (11:40 +0000)]
MDL-50687 phpunit: error early if required locale not installed

6 years agoMDL-52071 webservices: Bump version to update services
David Monllao [Thu, 12 Nov 2015 23:49:39 +0000 (07:49 +0800)]
MDL-52071 webservices: Bump version to update services

6 years agoMerge branch 'MDL-52071-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 12 Nov 2015 23:47:58 +0000 (07:47 +0800)]
Merge branch 'MDL-52071-master' of git://github.com/jleyva/moodle

6 years agoMDL-51819 theme: style fix for nested dropdowns
Dan Poltawski [Thu, 12 Nov 2015 21:54:50 +0000 (21:54 +0000)]
MDL-51819 theme: style fix for nested dropdowns

6 years agoMDL-42571 assignfeedback_editpdf: Fixed second PDF view
Bence Laky [Thu, 12 Nov 2015 10:21:39 +0000 (10:21 +0000)]
MDL-42571 assignfeedback_editpdf: Fixed second PDF view

6 years agoMDL-52071 ws: Add core_enrol_get_course_enrolment_methods to service
Juan Leyva [Thu, 12 Nov 2015 12:21:58 +0000 (13:21 +0100)]
MDL-52071 ws: Add core_enrol_get_course_enrolment_methods to service

6 years agoMDL-47065 notes: prevent empty spaces added as note
Dan Poltawski [Thu, 12 Nov 2015 09:54:39 +0000 (09:54 +0000)]
MDL-47065 notes: prevent empty spaces added as note

(And updated behat test for this test case)

6 years agoMDL-47065 behat: improve verificaton of lack of note
Jun Pataleta [Thu, 12 Nov 2015 09:43:26 +0000 (09:43 +0000)]
MDL-47065 behat: improve verificaton of lack of note

6 years agoMDL-47065 notes: don't add blank notes
Dan Poltawski [Thu, 5 Nov 2015 14:13:47 +0000 (14:13 +0000)]
MDL-47065 notes: don't add blank notes

Previously the logic was wrong and was proceeding to add a note
when content was missing.

Also add behat coverage for adding notes to participants (this test is
not perfect, but better than zero coverage we had before).

6 years agoMDL-51819 js: built changes
Dan Poltawski [Thu, 12 Nov 2015 09:00:56 +0000 (09:00 +0000)]
MDL-51819 js: built changes

6 years agoMerge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Thu, 12 Nov 2015 08:46:34 +0000 (08:46 +0000)]
Merge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle

6 years agoMDL-51819 themes: Nested navigation dropdowns work on small screens.
Simeon Naydenov [Mon, 9 Nov 2015 05:13:10 +0000 (13:13 +0800)]
MDL-51819 themes: Nested navigation dropdowns work on small screens.

6 years agoMerge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 11 Nov 2015 22:14:47 +0000 (23:14 +0100)]
Merge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle

6 years agoMDL-51515 assign: Fix typo setting url in nav tree.
Damyon Wiese [Fri, 25 Sep 2015 01:41:00 +0000 (09:41 +0800)]
MDL-51515 assign: Fix typo setting url in nav tree.

Thanks to Nelson Moller and Tyler Bannister.

6 years agoMerge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 11 Nov 2015 16:10:11 +0000 (17:10 +0100)]
Merge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle

6 years agoAutomatically generated installer lang files
AMOS bot [Wed, 11 Nov 2015 16:04:06 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMerge branch 'MDL-51495' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Wed, 11 Nov 2015 15:56:27 +0000 (16:56 +0100)]
Merge branch 'MDL-51495' of https://github.com/NeillM/moodle

6 years agoMerge branch 'MDL-50589-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 11 Nov 2015 15:53:08 +0000 (16:53 +0100)]
Merge branch 'MDL-50589-master' of git://github.com/jleyva/moodle

6 years agoMDL-51495 calendar: E_WARNING in core_calendar_get_calendar_events
Neill Magill [Tue, 20 Oct 2015 09:05:08 +0000 (10:05 +0100)]
MDL-51495 calendar: E_WARNING in core_calendar_get_calendar_events

If a user does not have the 'moodle/calendar:manageentries' capability then an E_WARNING
can be generated by the core_calendar_external::get_calendar_events() method, that an
expected array is null

This patch creates an array that is missing when a user does not have the capability.

6 years agoMDL-51495 calendar: Unit test to get an individual course event
Neill Magill [Tue, 20 Oct 2015 09:52:07 +0000 (10:52 +0100)]
MDL-51495 calendar: Unit test to get an individual course event

If is user requests a single event on a course via the web service they should be able to retrieve it.

6 years agoMDL-51988 behat: Add coverage of participation report messaging
Dan Poltawski [Wed, 11 Nov 2015 12:30:47 +0000 (12:30 +0000)]
MDL-51988 behat: Add coverage of participation report messaging

6 years agoMDL-51988 behat: select a table by <th> tag
Dan Poltawski [Wed, 11 Nov 2015 12:17:21 +0000 (12:17 +0000)]
MDL-51988 behat: select a table by <th> tag

6 years agoMDL-51988 report_particiption: do not allow messaging when disabled
Dan Poltawski [Tue, 3 Nov 2015 16:08:10 +0000 (16:08 +0000)]
MDL-51988 report_particiption: do not allow messaging when disabled

Previously the option to send messages when presented regardless of the
site setting.

6 years agoMerge branch 'MDL-51913_statistics_dup_1st_column' of git://github.com/barrysspace...
David Monllao [Wed, 11 Nov 2015 04:38:47 +0000 (12:38 +0800)]
Merge branch 'MDL-51913_statistics_dup_1st_column' of git://github.com/barrysspace/moodle

6 years agoMerge branch 'MDL-51922-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 11 Nov 2015 02:24:57 +0000 (10:24 +0800)]
Merge branch 'MDL-51922-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-51935-master' of git://github.com/dpalou/moodle
David Monllao [Wed, 11 Nov 2015 01:59:36 +0000 (09:59 +0800)]
Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle