Dan Poltawski [Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)]
Merge branch 'MDL-55742-master' of https://github.com/xow/moodle
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
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
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
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.
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
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}}
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
Andrew Nicols [Thu, 9 Jun 2016 00:52:08 +0000 (08:52 +0800)]
MDL-54873 assign: Fetch mapping id for blind marking grading
This change modifies the grading table to pre-seed record ids where they
already exist.
Where they do not exist, they are still fetched.
David Monllao [Fri, 26 Aug 2016 04:02:01 +0000 (12:02 +0800)]
MDL-55237 core_component: Fix last namespace level matching
Thanks to Andreas Grabs for proposing a fix.
Eloy Lafuente (stronk7) [Tue, 30 Aug 2016 00:28:32 +0000 (02:28 +0200)]
Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2016 16:59:13 +0000 (18:59 +0200)]
Merge branch 'MDL-55660-master-tablesql' of git://github.com/mudrd8mz/moodle
AMOS bot [Mon, 29 Aug 2016 16:04:47 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 29 Aug 2016 14:53:46 +0000 (16:53 +0200)]
Merge branch 'MDL-55667-master-participantslink' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 29 Aug 2016 12:08:37 +0000 (14:08 +0200)]
Merge branch 'MDL-55741' of git://github.com/timhunt/moodle
David Mudrák [Tue, 23 Aug 2016 12:10:41 +0000 (14:10 +0200)]
MDL-55667 navigation: Do not display site participants link to students
The problem here was that user/index.php checks the system level
capability moodle/site:viewparticipants when the user is on the front
page, and the moodle/course:viewparticipants on non-front pages.
But the navigation displayed the link by mistake even in situations,
when the user has the capability moodle/course:viewparticipants on the
front page (typically when the default role for the front page is set to
student).
Added behat tests for reproducing the bug and also for checking the
basic functionality of the feature.
David Monllao [Mon, 29 Aug 2016 08:53:46 +0000 (16:53 +0800)]
Merge branch 'wip-MDL-55581-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 29 Aug 2016 06:48:54 +0000 (14:48 +0800)]
Merge branch 'MDL-55710-master' of git://github.com/lameze/moodle
David Monllao [Mon, 29 Aug 2016 06:42:55 +0000 (14:42 +0800)]
Merge branch 'MDL-55650-master' of https://github.com/sammarshallou/moodle
David Monllao [Mon, 29 Aug 2016 06:40:03 +0000 (14:40 +0800)]
Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 29 Aug 2016 06:31:11 +0000 (14:31 +0800)]
Merge branch 'MDL-55312_load_timeout_for_amd_modules_master' of https://github.com/gthomas2/moodle
David Monllao [Mon, 29 Aug 2016 05:26:28 +0000 (13:26 +0800)]
Merge branch 'MDL-55665-master' of git://github.com/lameze/moodle
Marina Glancy [Tue, 16 Aug 2016 05:44:53 +0000 (13:44 +0800)]
MDL-55581 htmlpurifier: allow track tag in videos and audios
David Monllao [Mon, 29 Aug 2016 03:18:58 +0000 (11:18 +0800)]
Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 29 Aug 2016 03:14:11 +0000 (11:14 +0800)]
Merge branch 'MDL-55477' of git://github.com/timhunt/moodle
David Monllao [Mon, 29 Aug 2016 02:26:51 +0000 (10:26 +0800)]
Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle
Tim Hunt [Fri, 26 Aug 2016 16:14:05 +0000 (17:14 +0100)]
MDL-55741 phpunit: does not reset get_log_manager cache
AMOS bot [Fri, 26 Aug 2016 16:04:38 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 12 Aug 2016 11:17:55 +0000 (12:17 +0100)]
MDL-55372 stylelint: fully replace csslint
Remove the csslint config, remove an invalid property.
Kept csslint ignore lines becacase stylelint seems to respect them and
more work will be happening on css cleanup in MDL-55372.
Dan Poltawski [Fri, 12 Aug 2016 11:02:23 +0000 (12:02 +0100)]
MDL-55452 stylelint: prevent use of !important
Don't try and fix existing issues, just prevent new ones landing..
Andrew Nicols [Tue, 29 Mar 2016 07:26:29 +0000 (15:26 +0800)]
MDL-53634 forum: Switch digest selection to inplace_editable
Simey Lameze [Thu, 25 Aug 2016 03:59:13 +0000 (11:59 +0800)]
MDL-55710 core: Add support for doughnut charts
Simey Lameze [Tue, 23 Aug 2016 07:17:37 +0000 (15:17 +0800)]
MDL-55665 core: Add support for stacked bar charts
Dan Poltawski [Thu, 25 Aug 2016 15:07:36 +0000 (16:07 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 25 Aug 2016 15:04:42 +0000 (16:04 +0100)]
MDL-55072 tests: work around reset bug
Helen Foster [Thu, 25 Aug 2016 12:38:07 +0000 (14:38 +0200)]
MDL-55661 lang: Merge English strings from the en_fix language pack
Dan Poltawski [Thu, 25 Aug 2016 11:09:35 +0000 (12:09 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 25 Aug 2016 11:09:33 +0000 (12:09 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 25 Aug 2016 09:26:21 +0000 (10:26 +0100)]
Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle
David Monllao [Thu, 25 Aug 2016 08:50:15 +0000 (16:50 +0800)]
MDL-55127 mod_data: Search entries fixes
- If the database contains has than 4 valid fields all fields from the 4th one
to the last one will be merged into the 4th one so we index all entry contents
- get_content_value now receives the whole data_content record as fields may need
other values than just the content to prepare the value
- phpunit database generator changes to separate checkboxes from radio buttons options
and to separate multimenu options from menu options
Dan Poltawski [Thu, 25 Aug 2016 07:07:31 +0000 (08:07 +0100)]
Merge branch 'MDL-55320-master-fix2' of https://github.com/lameze/moodle
Simey Lameze [Thu, 25 Aug 2016 06:28:03 +0000 (14:28 +0800)]
MDL-55320 core: Add generaltable class to chart data table
David Monllao [Thu, 25 Aug 2016 02:58:01 +0000 (10:58 +0800)]
Merge branch 'wip-mdl-55072-fix' of git://github.com/rajeshtaneja/moodle
Simey Lameze [Tue, 23 Aug 2016 07:17:37 +0000 (15:17 +0800)]
MDL-55665 core: Add support for stacked bar charts
Rajesh Taneja [Thu, 25 Aug 2016 00:01:18 +0000 (08:01 +0800)]
MDL-46514 behat: Get config value from db, to avoid cache
Marina Glancy [Thu, 25 Aug 2016 01:53:29 +0000 (09:53 +0800)]
MDL-55708 mod_assign: display formatted acitvity names
Rajesh Taneja [Thu, 25 Aug 2016 01:17:38 +0000 (09:17 +0800)]
MDL-55072 behat: Cache themesuite and theme contexts
Rajesh Taneja [Thu, 25 Aug 2016 00:36:08 +0000 (08:36 +0800)]
MDL-55072 behat: Changed option to run-with-theme
AMOS bot [Wed, 24 Aug 2016 16:05:02 +0000 (00:05 +0800)]
Automatically generated installer lang files
Damyon Wiese [Wed, 24 Aug 2016 03:06:30 +0000 (11:06 +0800)]
MDL-55668 assign: Don't link to user profile if blind marking is enabled
Dan Poltawski [Wed, 24 Aug 2016 07:20:57 +0000 (08:20 +0100)]
Merge branch 'MDL-55320-fix' of https://github.com/lameze/moodle
Simey Lameze [Wed, 24 Aug 2016 06:27:39 +0000 (14:27 +0800)]
MDL-55320 theme: remove unnecessary styling
Andrew Nicols [Wed, 24 Aug 2016 06:04:07 +0000 (14:04 +0800)]
Merge branch 'MDL-55127_master-fix-requires' of git://github.com/dmonllao/moodle
David Monllao [Wed, 24 Aug 2016 05:57:44 +0000 (13:57 +0800)]
MDL-55127 mod_data: Adding missing required classes
Rajesh Taneja [Wed, 24 Aug 2016 04:53:47 +0000 (12:53 +0800)]
MDL-55072 behat: Fixed behat_selectors to be removed from contexts
Andrew Nicols [Wed, 24 Aug 2016 03:33:08 +0000 (11:33 +0800)]
MDL-54113 assign: Open files in new window
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
David Monllao [Wed, 24 Aug 2016 01:39:01 +0000 (09:39 +0800)]
MDL-55604 cache: Updating comment according to code changes
David Monllao [Wed, 24 Aug 2016 01:35:39 +0000 (09:35 +0800)]
Merge branch 'MDL-55604' of https://github.com/mr-russ/moodle
David Monllao [Wed, 24 Aug 2016 01:26:29 +0000 (09:26 +0800)]
Merge branch 'wip-mdl-55072' of https://github.com/rajeshtaneja/moodle
Russell Smith [Thu, 18 Aug 2016 11:38:12 +0000 (21:38 +1000)]
MDL-55604 cache: Fix identifier and cacheable_object
When a cachable object is store in the static cache from
the backing store, it was incorrect serialised rather than
using the wake function. This has been resolved and tests added.
During the investigation into cacheable_object, it was discovered
that set_identifiers never removes identifiers when you call it,
so set_identifiers(array('a')) and set_identifiers(array('b')) really
resulted in array('a','b') as the identifiers rather than 'b'.
The fix for this issue depends on the set_identifiers fix and
they have been coupled together as a result.
Rajesh Taneja [Wed, 3 Aug 2016 07:07:52 +0000 (15:07 +0800)]
MDL-55072 behat: Allow behat_selectors to be overridden
if theme/tests/behat/behat_theme_{THEME_NAME}_behat_selectors.php
file exits, and has class with same file name then we will
call behat_theme_{THEME_NAME}_behat_selectors::register_moodle_selectors()
to register theme specific selectors. If they are different
then core then they will override
Rajesh Taneja [Thu, 28 Jul 2016 06:29:54 +0000 (14:29 +0800)]
MDL-55072 behat: Added support for overriding theme tests
David Monllao [Wed, 24 Aug 2016 00:24:21 +0000 (08:24 +0800)]
Merge branch 'MDL-55385_master' of https://github.com/marxjohnson/moodle
gthomas2 [Tue, 23 Aug 2016 16:40:03 +0000 (17:40 +0100)]
MDL-55312 requirejs: Fix timeouts with infinite waitSeconds
Dan Poltawski [Tue, 23 Aug 2016 14:48:11 +0000 (15:48 +0100)]
Merge branch 'MDL-55628-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 23 Aug 2016 11:36:28 +0000 (12:36 +0100)]
MDL-55423 tests: remove non-cross-db testcase
This isn't used in moodle core and is problematic on oracle, don't test
it.
Mark Johnson [Fri, 19 Aug 2016 10:24:48 +0000 (11:24 +0100)]
MDL-55385 output: Support non-integer output_buffering values
Dan Poltawski [Tue, 23 Aug 2016 10:12:46 +0000 (11:12 +0100)]
Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle
Andrew Nicols [Tue, 23 Aug 2016 07:40:54 +0000 (15:40 +0800)]
MDL-46654 mod_forum: Reduce complexity of closure
Dan Poltawski [Tue, 23 Aug 2016 07:59:24 +0000 (08:59 +0100)]
Merge branch 'wip-mdl-46514' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 23 Aug 2016 07:30:54 +0000 (15:30 +0800)]
Merge branch 'MDL-46654-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 23 Aug 2016 07:18:16 +0000 (08:18 +0100)]
Merge branch 'MDL-48773_m32v1' of https://github.com/sbourget/moodle
Rajesh Taneja [Tue, 16 Aug 2016 03:08:09 +0000 (11:08 +0800)]
MDL-46514 behat: section should be set before switch-case
Rajesh Taneja [Tue, 9 Aug 2016 05:32:30 +0000 (13:32 +0800)]
MDL-46514 behat: Catch php errors in shutdown hook
If error is not displayed in web browser then
it will be caught in shutdown hook, so we can
show it to user
David Monllao [Tue, 23 Aug 2016 05:24:29 +0000 (13:24 +0800)]
Merge branch 'MDL-55391-master' of git://github.com/danpoltawski/moodle