Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)]
Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)]
Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 12 Sep 2016 11:17:40 +0000 (12:17 +0100)]
Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 12 Sep 2016 10:49:33 +0000 (11:49 +0100)]
Merge branch 'wip-mdl-55353' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 12 Sep 2016 10:36:18 +0000 (11:36 +0100)]
Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 12 Sep 2016 09:18:18 +0000 (10:18 +0100)]
Merge branch 'wip-mdl-55610' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 12 Sep 2016 04:49:27 +0000 (12:49 +0800)]
Merge branch 'MDL-55122-master' of git://github.com/lameze/moodle
David Monllao [Mon, 12 Sep 2016 04:37:44 +0000 (12:37 +0800)]
Merge branch 'MDL-55626-MASTER' of git://github.com/lazydaisy/moodle
David Monllao [Mon, 12 Sep 2016 03:55:51 +0000 (11:55 +0800)]
Merge branch 'MDL-55873-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 7 Sep 2016 04:41:24 +0000 (12:41 +0800)]
MDL-55873 login: change back username fields to use PARAM_RAW
lazydaisy [Thu, 18 Aug 2016 16:30:53 +0000 (17:30 +0100)]
MDL-55626 theme_clean: Fixed clean theme missing desktop-first-column
Rajesh Taneja [Fri, 9 Sep 2016 00:51:03 +0000 (08:51 +0800)]
MDL-55353 behat: Ensure teacher edit activity at different time
Recent activity is showing activities which were
updated since user last logged in and first modification
done on the activity. So ensure update happens at different
time than activity created.
Simey Lameze [Tue, 6 Sep 2016 07:19:04 +0000 (15:19 +0800)]
MDL-55122 enrol: remove duplicated updown variable
Simey Lameze [Thu, 1 Sep 2016 02:49:38 +0000 (10:49 +0800)]
MDL-53893 core_badges: Behat for all selected roles award badges
Simey Lameze [Wed, 31 Aug 2016 06:07:38 +0000 (14:07 +0800)]
MDL-53893 core_badges: Add strictness to manual badge criteria
David Monllao [Mon, 29 Aug 2016 08:15:22 +0000 (16:15 +0800)]
MDL-55755 search: Correct event link
Dan Poltawski [Thu, 8 Sep 2016 09:25:48 +0000 (10:25 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 8 Sep 2016 08:15:14 +0000 (09:15 +0100)]
Merge branch 'MDL-55504_no-phpunit-utils' of git://github.com/dmonllao/moodle
David Monllao [Thu, 8 Sep 2016 07:32:46 +0000 (15:32 +0800)]
MDL-55504 profiling: No profiling for PHPUNIT_UTIL stuff
David Monllao [Thu, 8 Sep 2016 05:56:33 +0000 (13:56 +0800)]
weekly release 3.2dev
Rajesh Taneja [Wed, 7 Sep 2016 23:11:10 +0000 (07:11 +0800)]
MDL-55415 phpunit: Option values are set to false by default
Eric Merrill [Wed, 7 Sep 2016 21:13:46 +0000 (17:13 -0400)]
MDL-55725 search: Index proper time modified with indexed files
Juan Leyva [Wed, 7 Sep 2016 13:53:37 +0000 (14:53 +0100)]
MDL-55415 course: Fix unit tests after fixing beat issues
Dan Poltawski [Wed, 7 Sep 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'wip-mdl-55415' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 7 Sep 2016 09:09:42 +0000 (17:09 +0800)]
MDL-55415 course: Set default options to false for frontpage
Adrian Greeve [Wed, 7 Sep 2016 06:29:13 +0000 (14:29 +0800)]
MDL-41174 mod_workshop: Added workshop_refresh_events
This function was missing from this activity.
Stephen Bourget [Wed, 7 Sep 2016 01:29:34 +0000 (21:29 -0400)]
MDL-52798 calendar: Move calendar preferences to a user preferences page
This is based on the work of Shamim Rezaie and will also resolve
MDL-52375 and MDL-50378
Jake Dallimore [Fri, 5 Aug 2016 02:34:22 +0000 (10:34 +0800)]
MDL-50803 login: Remove token from URL in forgot password process
Store the token value in the session and redirect to self, thus
removing the token from the URL and eliminating the problem where
the token is exposed via the http referer header.
Juan Leyva [Mon, 11 Jul 2016 11:06:40 +0000 (12:06 +0100)]
MDL-49026 webservice: Remove tokens on password change
Eloy Lafuente (stronk7) [Wed, 7 Sep 2016 01:06:12 +0000 (03:06 +0200)]
Merge branch 'wip-mdl-55764' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 18:30:49 +0000 (20:30 +0200)]
Merge branch 'MDL-55236' of https://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 14:20:32 +0000 (16:20 +0200)]
Merge branch 'MDL-55618' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 14:08:17 +0000 (16:08 +0200)]
Merge branch 'wip-MDL-55844-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 13:56:01 +0000 (15:56 +0200)]
Merge branch 'wip-MDL-55832-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 6 Sep 2016 10:47:57 +0000 (11:47 +0100)]
MDL-42125 quiz stats: removal trivial additional phpdocs newline
Dan Poltawski [Tue, 6 Sep 2016 10:46:52 +0000 (11:46 +0100)]
Merge branch 'MDL-42125' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 6 Sep 2016 09:50:49 +0000 (10:50 +0100)]
MDL-55415 course: fix trailing whitespace
Dan Poltawski [Tue, 6 Sep 2016 09:49:39 +0000 (10:49 +0100)]
Merge branch 'MDL-55415-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 Sep 2016 07:43:52 +0000 (08:43 +0100)]
Merge branch 'wip-mdl-55749' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 6 Sep 2016 03:30:13 +0000 (11:30 +0800)]
Merge branch 'MDL-55504' of https://github.com/mr-russ/moodle
Russell Smith [Tue, 9 Aug 2016 00:09:23 +0000 (10:09 +1000)]
MDL-55504 profiling: Support for PHPUnit and big profiles.
To support PHPUnit we need to support large profiles, these may
include backups and restores. To do that the following was required;
- gzcompress for database space saving.
- gzcompress for XML DomDocument field to say < 10Mb and allow imports.
- Save PHPUnit runs directly to a file so they can be imported to the normal database.
- Memory allowance on profiling view pages increases to support large profiles.
Rajesh Taneja [Mon, 29 Aug 2016 03:54:36 +0000 (11:54 +0800)]
MDL-55749 badges: define global before using it
David Monllao [Tue, 6 Sep 2016 02:17:49 +0000 (10:17 +0800)]
Merge branch 'MDL-55617' of https://github.com/NeillM/moodle
David Monllao [Tue, 6 Sep 2016 02:15:31 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-55288' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 6 Sep 2016 02:07:00 +0000 (10:07 +0800)]
Merge branch 'MDL-55587-master' of git://github.com/cameron1729/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 17:23:13 +0000 (19:23 +0200)]
Merge branch 'MDL-55239_m32v1' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)]
Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 16:01:21 +0000 (18:01 +0200)]
Merge branch 'MDL-55717_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 15:33:25 +0000 (17:33 +0200)]
Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle
Juan Leyva [Tue, 2 Aug 2016 13:39:30 +0000 (15:39 +0200)]
MDL-55415 course: New WS core_course_get_user_administration_options
Juan Leyva [Tue, 2 Aug 2016 13:17:14 +0000 (15:17 +0200)]
MDL-55415 course: Move admin options permission check to API
Juan Leyva [Tue, 2 Aug 2016 10:31:40 +0000 (12:31 +0200)]
MDL-55415 course: New WS core_course_get_user_navigation_options
Juan Leyva [Tue, 2 Aug 2016 10:30:10 +0000 (12:30 +0200)]
MDL-55415 webservice: Allow validate_courses to return contexts
Juan Leyva [Tue, 2 Aug 2016 09:49:14 +0000 (11:49 +0200)]
MDL-55415 course: Move options permission check to API
Dan Poltawski [Mon, 5 Sep 2016 13:09:09 +0000 (14:09 +0100)]
Merge branch 'MDL-55627' of https://github.com/bostelm/moodle
Dan Poltawski [Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)]
Merge branch 'MDL-55742-master' of https://github.com/xow/moodle
Henning Bostelmann [Thu, 18 Aug 2016 16:01:12 +0000 (17:01 +0100)]
MDL-55627 filter_mathjaxloader: use correct string concatenation op
Henning Bostelmann [Thu, 14 Jul 2016 17:02:05 +0000 (18:02 +0100)]
MDL-55236 mod_assign: Allow subplugins to backup files
Dan Poltawski [Mon, 5 Sep 2016 09:18:53 +0000 (10:18 +0100)]
Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 5 Sep 2016 08:24:27 +0000 (09:24 +0100)]
Merge branch 'wip-mdl-55766' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 5 Sep 2016 07:27:58 +0000 (08:27 +0100)]
Merge branch 'MDL-55815' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 5 Sep 2016 07:18:32 +0000 (08:18 +0100)]
Merge branch 'wip-MDL-55826-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 5 Sep 2016 06:53:26 +0000 (07:53 +0100)]
Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle
Rajesh Taneja [Thu, 21 Jul 2016 03:06:46 +0000 (11:06 +0800)]
MDL-55288 forms: Set data attribute to form fields
David Monllao [Mon, 5 Sep 2016 05:44:36 +0000 (13:44 +0800)]
Merge branch 'wip-MDL-41174-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 1 Sep 2016 12:19:11 +0000 (20:19 +0800)]
MDL-55832 mod_feedback: apply filters to multichoice quesitons
Marina Glancy [Fri, 2 Sep 2016 09:59:58 +0000 (17:59 +0800)]
MDL-55844 profile: display formatted course name
David Monllao [Mon, 5 Sep 2016 03:48:34 +0000 (11:48 +0800)]
Merge branch 'MDL-55457-master' of https://github.com/xow/moodle
David Monllao [Mon, 5 Sep 2016 03:34:06 +0000 (11:34 +0800)]
Merge branch 'wip_MDL-53724_master' of git://github.com/gjb2048/moodle
David Monllao [Mon, 5 Sep 2016 02:46:57 +0000 (10:46 +0800)]
Merge branch 'wip-MDL-55707-master' of git://github.com/abgreeve/moodle
Rajesh Taneja [Mon, 5 Sep 2016 02:18:19 +0000 (10:18 +0800)]
MDL-55610 behat: Clear static file cache
php file cache might be out-of-sync
to ensure full directory is deleted
clear php file cache
Adrian Greeve [Fri, 2 Sep 2016 02:42:29 +0000 (10:42 +0800)]
MDL-41174 course: Module name change updates calendar.
Marina Glancy [Fri, 2 Sep 2016 02:52:02 +0000 (10:52 +0800)]
MDL-55826 question: fix PHP7.1 strict warnings
John Okely [Thu, 4 Aug 2016 06:38:21 +0000 (14:38 +0800)]
MDL-55457 mod_lti: Support object icon_info in tool proxy
Gareth J Barnard [Tue, 12 Apr 2016 17:37:19 +0000 (18:37 +0100)]
MDL-53724 themes: Inconsistent padding when >= one blocks are docked.
Tim Hunt [Thu, 1 Sep 2016 11:36:05 +0000 (12:36 +0100)]
MDL-42125 quiz stats: fix regression caused by MDL-51603
Tim Hunt [Mon, 22 Aug 2016 16:18:56 +0000 (17:18 +0100)]
MDL-42125 quiz stats: clearer message when manual grading required
Neill Magill [Thu, 18 Aug 2016 07:49:37 +0000 (08:49 +0100)]
MDL-55617 backup: Possible fatal errors in backup and restore
The unserialize() function will not always return an object
especially when as can happen the controller field of a
record in the backup_controllers table is empty.
This change ensures that in this case the script will
not cause a fatal error, but instead throw an error.
Neill Magill [Thu, 18 Aug 2016 07:49:59 +0000 (08:49 +0100)]
MDL-55618 backup: Header should not be output twice
Before this patch if the pre-check failed during
the final stage of an import a request for the
page header to be output was made for a second
time, this caused a coding_error to occur.
This change removes the second request to
output the page header, which will allow the user
to see the reasons the pre-check failed.
John Okely [Wed, 31 Aug 2016 08:57:38 +0000 (16:57 +0800)]
MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc
Thanks to Bishop Bettini for the original patch.
David Monllao [Thu, 1 Sep 2016 03:14:03 +0000 (11:14 +0800)]
weekly release 3.2dev
David Monllao [Thu, 1 Sep 2016 03:14:01 +0000 (11:14 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Adrian Greeve [Wed, 31 Aug 2016 01:50:17 +0000 (09:50 +0800)]
MDL-55707 grades: Stop infinite loop when regrading.
Marina Glancy [Thu, 1 Sep 2016 00:34:32 +0000 (08:34 +0800)]
MDL-55665 charts: correction to stacked bar charts
Tim Hunt [Wed, 31 Aug 2016 11:55:18 +0000 (12:55 +0100)]
MDL-55815 quiz review: after close should beat immediately after
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
Tim Hunt [Wed, 31 Aug 2016 11:40:50 +0000 (12:40 +0100)]
MDL-55815 quiz: convert attempt state tests to a data provider
David Monllao [Wed, 31 Aug 2016 01:57:31 +0000 (09:57 +0800)]
Merge branch 'wip-MDL-38105-master' of https://github.com/marinaglancy/moodle
Rajesh Taneja [Tue, 30 Aug 2016 01:24:33 +0000 (09:24 +0800)]
MDL-55766 behat: set core behat selectors if not overridden by theme
Eloy Lafuente (stronk7) [Tue, 30 Aug 2016 10:54:46 +0000 (12:54 +0200)]
Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle
sam marshall [Thu, 25 Aug 2016 16:04:11 +0000 (17:04 +0100)]
MDL-55724 Glossary: Prevent infinite loop in trusttext_strip
David Monllao [Tue, 30 Aug 2016 08:38:18 +0000 (16:38 +0800)]
Merge branch 'MDL-55372-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 30 Aug 2016 08:25:28 +0000 (16:25 +0800)]
Merge branch 'MDL-55452-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 9 Aug 2016 05:43:02 +0000 (13:43 +0800)]
MDL-38105 gradingform_rubric: option to lock 0 level for rubrics
this also allows using negative scores
Mark Nelson [Tue, 30 Aug 2016 06:47:09 +0000 (14:47 +0800)]
MDL-55771 core: added title attribute when using JS to render {{pix}}
Rajesh Taneja [Tue, 30 Aug 2016 06:38:49 +0000 (14:38 +0800)]
MDL-55759 behat: No profile guided alloaction in phpunit
Marina Glancy [Tue, 30 Aug 2016 05:44:13 +0000 (13:44 +0800)]
MDL-55581 htmlpurifier: test for attributes in video tag
David Monllao [Tue, 30 Aug 2016 04:52:38 +0000 (12:52 +0800)]
Merge branch 'MDL-54873-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 30 Aug 2016 03:16:18 +0000 (11:16 +0800)]
MDL-54873 assign: Seed recordid to print_recent_activity
Andrew Nicols [Tue, 30 Aug 2016 03:01:48 +0000 (11:01 +0800)]
MDL-54873 assign: Add recordid fetching participants
get_submission_info_for_participants is primarily used by externallib.php
Andrew Nicols [Tue, 30 Aug 2016 02:57:25 +0000 (10:57 +0800)]
MDL-54873 assign: Fetch mapping id for blind marking in cron