Andrew Nicols [Tue, 19 Jan 2016 00:04:59 +0000 (08:04 +0800)]
Merge branch 'MDL-49291_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 18 Jan 2016 23:56:41 +0000 (07:56 +0800)]
Merge branch 'MDL-50268-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jan 2016 23:29:26 +0000 (00:29 +0100)]
Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Mon, 18 Jan 2016 15:50:11 +0000 (15:50 +0000)]
Merge branch 'MDL-52750' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jan 2016 14:47:45 +0000 (14:47 +0000)]
Merge branch 'MDL-52738' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jan 2016 14:39:46 +0000 (14:39 +0000)]
Merge branch 'wip-mdl-52721' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 18 Jan 2016 14:03:54 +0000 (14:03 +0000)]
Merge branch 'MDL-52218_master_alt' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 18 Jan 2016 11:19:55 +0000 (11:19 +0000)]
Merge branch 'MDL-52486-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 18 Jan 2016 10:24:04 +0000 (10:24 +0000)]
Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 18 Jan 2016 06:54:54 +0000 (14:54 +0800)]
Merge branch 'MDL-45265-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Mon, 18 Jan 2016 06:47:52 +0000 (14:47 +0800)]
Merge branch 'MDL-52608-master' of https://github.com/xow/moodle
Andrew Nicols [Mon, 18 Jan 2016 06:32:41 +0000 (14:32 +0800)]
Merge branch 'MDL-52573-master' of git://github.com/danpoltawski/moodle
Mark Nelson [Wed, 6 Jan 2016 06:05:30 +0000 (14:05 +0800)]
MDL-49291 core: final deprecation of sql_*_reader interfaces
Andrew Nicols [Mon, 18 Jan 2016 06:24:23 +0000 (14:24 +0800)]
Merge branch 'MDL-50464-master' of https://github.com/hcpss-banderson/moodle
Simey Lameze [Mon, 18 Jan 2016 05:44:22 +0000 (13:44 +0800)]
MDL-50268 core: proper deprecation of get_file_url() method
Andrew Nicols [Mon, 18 Jan 2016 02:26:57 +0000 (10:26 +0800)]
MDL-50915 mod_lesson: Remove js dependencies from behat tests
Rajesh Taneja [Wed, 13 Jan 2016 07:13:12 +0000 (15:13 +0800)]
MDL-52721 unittest: Exclude tests in vendor and node_modules
Andrew Nicols [Mon, 18 Jan 2016 02:18:31 +0000 (10:18 +0800)]
Merge branch 'MDL-50915_m31v5' of https://github.com/sbourget/moodle
Andrew Nicols [Mon, 18 Jan 2016 01:49:22 +0000 (09:49 +0800)]
Merge branch 'MDL-52570-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 18 Jan 2016 01:37:29 +0000 (09:37 +0800)]
MDL-52309 gradereport_history: Adjust comment
Andrew Nicols [Mon, 18 Jan 2016 01:33:36 +0000 (09:33 +0800)]
Merge branch 'MDL-52309' of https://github.com/smbader/moodle
Jun Pataleta [Wed, 6 Jan 2016 05:24:42 +0000 (13:24 +0800)]
MDL-36404 gradingform_rubric: Accessibility fixes rubric grading
Tim Hunt [Tue, 12 Jan 2016 17:08:32 +0000 (17:08 +0000)]
MDL-52738 quiz: Previous button during attempt review.
This is to be consistent with places like forum and book, where if we
have a next link, we also have a previous link.
At the same time I have amended the links/buttons from 'Previous'/'Next'
to 'Previous page'/'Next page' because I think that is clearer.
Also, on the last page of the quiz, I have changed 'Next' to 'Finish
attempt ...' for consistency with the link in the navigation block.
AMOS BEGIN
CPY [navigatenext,mod_assignment],[navigatenext,mod_quiz]
CPY [navigateprevious,mod_assignment],[navigateprevious,mod_quiz]
AMOS END
Tim Hunt [Wed, 13 Jan 2016 13:37:15 +0000 (13:37 +0000)]
MDL-52750 quiz reviewQ/comment: add page title & student name
Brendan Anderson [Tue, 1 Dec 2015 22:22:35 +0000 (17:22 -0500)]
MDL-50464 block_rss_client: Implement renderers and templates
Dan Poltawski [Thu, 7 Jan 2016 11:16:59 +0000 (11:16 +0000)]
MDL-52573 report_grader: only check cap of installed plugins
Previously we were linking to gradebook plugins regardless of whether
they were installed. This should be fixed properly in MDL-52678.
Dan Poltawski [Thu, 14 Jan 2016 10:09:55 +0000 (10:09 +0000)]
weekly release 3.1dev
Dan Poltawski [Thu, 14 Jan 2016 10:09:55 +0000 (10:09 +0000)]
NOBUG: Fixed file access permissions
Dan Poltawski [Thu, 14 Jan 2016 10:09:52 +0000 (10:09 +0000)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Thu, 14 Jan 2016 10:09:52 +0000 (10:09 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 14 Jan 2016 08:31:14 +0000 (08:31 +0000)]
Merge branch 'wip-MDL-50851-backupfix' of https://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Jan 2016 08:24:38 +0000 (16:24 +0800)]
MDL-50851 core_tag: avoid fatal errors with corrupted data
Marina Glancy [Thu, 14 Jan 2016 07:26:49 +0000 (15:26 +0800)]
MDL-50851 core_tag: fix db query failure on oracle (again)
Andrew Nicols [Thu, 14 Jan 2016 05:24:57 +0000 (13:24 +0800)]
Merge branch 'wip-MDL-50851-backupfix' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Jan 2016 05:19:12 +0000 (13:19 +0800)]
MDL-50851 core_tag: fix db query failure on oracle
Andrew Nicols [Thu, 14 Jan 2016 03:03:26 +0000 (11:03 +0800)]
Merge branch 'wip-MDL-50851-backupfix' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Jan 2016 02:54:27 +0000 (10:54 +0800)]
MDL-50851 core_tag: make query cross-db compatible
Dan Poltawski [Wed, 13 Jan 2016 15:21:17 +0000 (15:21 +0000)]
MDL-49290 message: add note about removed function
Dan Poltawski [Wed, 13 Jan 2016 15:21:01 +0000 (15:21 +0000)]
Merge branch 'MDL-49290_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 13 Jan 2016 14:29:22 +0000 (14:29 +0000)]
MDL-50851 tag: fix whitespace errors
Dan Poltawski [Wed, 13 Jan 2016 13:56:38 +0000 (13:56 +0000)]
MDL-49662 local: upgrade.txt note
Dan Poltawski [Wed, 13 Jan 2016 12:35:18 +0000 (12:35 +0000)]
Merge branch 'wip-MDL-50851-backupfix' of https://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 13 Jan 2016 12:00:11 +0000 (12:00 +0000)]
MDL-50851 upgrade: dan *REALLY* *REALLY* sucks at integrating
Dan Poltawski [Wed, 13 Jan 2016 11:40:49 +0000 (11:40 +0000)]
Merge branch 'MDL-49662_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 13 Jan 2016 11:31:21 +0000 (11:31 +0000)]
MDL-49111 bennu: remove outdated readme note
Marina Glancy [Wed, 13 Jan 2016 10:44:41 +0000 (18:44 +0800)]
MDL-50851 block_tags: map context and colleciton in restore
Dan Poltawski [Wed, 13 Jan 2016 09:09:22 +0000 (09:09 +0000)]
MDL-52210 upgrade: dan *REALLY* sucks at integrating
Dan Poltawski [Wed, 13 Jan 2016 09:00:13 +0000 (09:00 +0000)]
MDL-52210 upgrade: dan sucks at integrating
Dan Poltawski [Wed, 13 Jan 2016 08:57:04 +0000 (08:57 +0000)]
Merge branch 'MDL-52210-master-2' of git://github.com/cameron1729/moodle
Cameron Ball [Wed, 13 Jan 2016 05:48:06 +0000 (13:48 +0800)]
MDL-52210 webservices: Revise upgrade version number.
Andrew Nicols [Wed, 13 Jan 2016 02:22:24 +0000 (10:22 +0800)]
Merge branch 'MDL-372-int-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 13 Jan 2016 02:20:25 +0000 (10:20 +0800)]
MDL-43620 mod_chat: Whitespace fix
Ryan Wyllie [Thu, 7 Jan 2016 08:09:57 +0000 (08:09 +0000)]
MDL-372 forum: tests for pinned discussions
Ben Kelada [Thu, 12 Nov 2015 23:10:59 +0000 (10:10 +1100)]
MDL-372 forum: Improve pinning and update for Moodle 3.0
Charles Fulton [Sun, 25 Mar 2012 14:39:24 +0000 (07:39 -0700)]
MDL-372 forum: support for pinned discussion topics
Andrew Nicols [Wed, 13 Jan 2016 01:56:31 +0000 (09:56 +0800)]
Merge branch 'MDL-50829-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 13 Jan 2016 01:38:45 +0000 (09:38 +0800)]
Merge branch 'MDL-43620_m31v2' of https://github.com/sbourget/moodle
Andrew Nicols [Wed, 13 Jan 2016 01:12:18 +0000 (09:12 +0800)]
Merge branch 'MDL-51710-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Wed, 13 Jan 2016 01:07:13 +0000 (09:07 +0800)]
Merge branch 'MDL-52507_master' of https://github.com/jinhofer/moodle
Andrew Nicols [Wed, 13 Jan 2016 01:06:03 +0000 (09:06 +0800)]
Merge branch 'MDL-52586-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 13 Jan 2016 00:58:29 +0000 (08:58 +0800)]
Merge branch 'MDL-52649-master' of git://github.com/junpataleta/moodle
Joseph Inhofer [Mon, 14 Dec 2015 22:17:13 +0000 (16:17 -0600)]
MDL-52507 enrol/manual: Generated a smart zIndex
Dan Poltawski [Tue, 12 Jan 2016 17:02:24 +0000 (17:02 +0000)]
Merge branch 'MDL-49021_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 17:01:51 +0000 (17:01 +0000)]
Merge branch 'MDL-49111_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 17:01:13 +0000 (17:01 +0000)]
Merge branch 'MDL-49553_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 16:56:12 +0000 (16:56 +0000)]
Merge branch 'MDL-49724_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 16:56:06 +0000 (16:56 +0000)]
Merge branch 'MDL-49784_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 16:56:01 +0000 (16:56 +0000)]
Merge branch 'MDL-49824_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 12 Jan 2016 16:34:58 +0000 (16:34 +0000)]
MDL-50851 tag: fix whitespace errors
AMOS bot [Tue, 12 Jan 2016 16:03:55 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 12 Jan 2016 14:17:14 +0000 (14:17 +0000)]
Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 12 Jan 2016 13:36:13 +0000 (13:36 +0000)]
Merge branch 'MDL-52210-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 12 Jan 2016 13:31:40 +0000 (13:31 +0000)]
Merge branch 'MDL-52315-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 12 Jan 2016 12:56:09 +0000 (12:56 +0000)]
Merge branch 'MDL-52661-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 12 Jan 2016 11:35:25 +0000 (11:35 +0000)]
Merge branch 'MDL-52491-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 12 Jan 2016 11:08:11 +0000 (11:08 +0000)]
Merge branch 'MDL-21912-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 12 Jan 2016 10:36:43 +0000 (10:36 +0000)]
Merge branch 'wip-mdl-52656' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 12 Jan 2016 07:57:36 +0000 (15:57 +0800)]
Merge branch 'master' of https://github.com/janeklb/moodle
Andrew Nicols [Tue, 12 Jan 2016 06:46:31 +0000 (14:46 +0800)]
Merge branch 'MDL-52560-m' of https://github.com/micaherne/moodle
Andrew Nicols [Tue, 12 Jan 2016 06:35:36 +0000 (14:35 +0800)]
Merge branch 'MDL-52585-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 12 Jan 2016 06:32:34 +0000 (14:32 +0800)]
Merge branch 'MDL-52610_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 12 Jan 2016 04:54:04 +0000 (12:54 +0800)]
Merge branch 'MDL-52643_m31v1' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 12 Jan 2016 04:44:17 +0000 (12:44 +0800)]
Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle
Andrew Nicols [Tue, 12 Jan 2016 04:34:28 +0000 (12:34 +0800)]
Merge branch 'patch-11' of https://github.com/sk-unikent/moodle
Andrew Nicols [Tue, 12 Jan 2016 04:30:16 +0000 (12:30 +0800)]
Merge branch 'MDL-52563-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 12 Jan 2016 04:23:20 +0000 (12:23 +0800)]
MDL-38020 behat: Correct singleselect usage
Andrew Nicols [Tue, 12 Jan 2016 03:58:24 +0000 (11:58 +0800)]
Merge branch 'MDL-38020-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 12 Jan 2016 03:45:58 +0000 (11:45 +0800)]
Merge branch 'MDL-27840-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 11 Jan 2016 15:31:23 +0000 (15:31 +0000)]
Merge branch 'MDL-52589-m' of https://github.com/micaherne/moodle
David Monllao [Wed, 6 Jan 2016 06:41:35 +0000 (14:41 +0800)]
MDL-52610 user: Honour allowaccountssameemail in create_users ws
Credit to Dmitriy Kuzevanov.
Jun Pataleta [Fri, 8 Jan 2016 08:57:32 +0000 (16:57 +0800)]
MDL-52649 user: Add check for potentially undefined variables
Steve Bader [Mon, 30 Nov 2015 15:38:33 +0000 (10:38 -0500)]
MDL-52309 gradereport_history: require user to submit parameters
Prevent a timely full report from loading when need is exceedingly
rare. Only execute the report when the user has submitted the form.
Dan Poltawski [Mon, 11 Jan 2016 13:17:10 +0000 (13:17 +0000)]
Merge branch 'MDL-52000-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 11 Jan 2016 11:08:25 +0000 (11:08 +0000)]
Merge branch 'MDL-41531-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 11 Jan 2016 09:24:22 +0000 (09:24 +0000)]
Merge branch 'wip-MDL-52697-master' of git://github.com/abgreeve/moodle
Michael Aherne [Tue, 22 Dec 2015 16:01:06 +0000 (16:01 +0000)]
MDL-52589 cache: Allow unused stores to be uninstalled
Mark Nelson [Fri, 8 Jan 2016 07:34:51 +0000 (15:34 +0800)]
MDL-52218 gradereport_grader: added behat test for switching views
Mark Nelson [Thu, 7 Jan 2016 11:34:19 +0000 (19:34 +0800)]
MDL-52218 gradereport_grader: fixed 'grade:viewhidden' related errors
There were two main reasons why there were PHP errors.
1) We were not passing variables as references.
2) When we were restricting the number of items shown in
the report we were not collecting all of the dependencies
which were required when a user did *not* have the
capability 'moodle/grade:viewhidden'. This would cause
an undefined offset error due to the index missing in
the dependency array.
This also meant that a user without the capability 'moodle/grade:viewhidden'
could view the course total without hidden items being taken into account
if they were not being displayed. To resolve this we now pass all the grades
and grade items when the user does not have the capability - which also solves
the PHP errors listed above.
Cameron Ball [Mon, 11 Jan 2016 07:23:29 +0000 (15:23 +0800)]
MDL-52486 JavaScript: Make sure lang codes use underscores.
In some cases, underscores in lang codes get replaced with dashes
which causes some JavaScript to be unhappy. This patch simply reverse
the underscore to dash replacement on the JS side.
Cameron Ball [Mon, 11 Jan 2016 06:08:58 +0000 (14:08 +0800)]
MDL-21912 restore: Add admin setting to restore conflicting admin user