Andrew Nicols [Tue, 24 Jan 2017 06:57:53 +0000 (14:57 +0800)]
Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 24 Jan 2017 05:26:47 +0000 (13:26 +0800)]
Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 24 Jan 2017 05:01:45 +0000 (13:01 +0800)]
Merge branch 'MDL-57408-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 24 Jan 2017 00:47:54 +0000 (08:47 +0800)]
Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
Dan Marsden [Tue, 24 Jan 2017 00:05:50 +0000 (13:05 +1300)]
MDL-46782 mod_scorm: fix completion test, remove redundant test.
Dan Poltawski [Mon, 23 Jan 2017 16:21:02 +0000 (16:21 +0000)]
Merge branch 'wip_master_mdl-50625_ldap_better_check_paged_results_support' of https://github.com/iarenaza/moodle
Dan Poltawski [Mon, 23 Jan 2017 15:39:55 +0000 (15:39 +0000)]
Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle
Dan Poltawski [Mon, 23 Jan 2017 12:24:10 +0000 (12:24 +0000)]
Merge branch 'MDL-57415_m33v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 23 Jan 2017 12:19:22 +0000 (12:19 +0000)]
Merge branch 'MDL-57287-master' of git://github.com/snake/moodle
Dan Poltawski [Mon, 23 Jan 2017 12:05:32 +0000 (12:05 +0000)]
Merge branch 'mdl57668-master' of https://github.com/tlock/moodle
Dan Poltawski [Mon, 23 Jan 2017 11:59:11 +0000 (11:59 +0000)]
Merge branch 'wip-mdl-57700' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Jan 2017 09:48:11 +0000 (09:48 +0000)]
Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 30 Dec 2016 09:01:19 +0000 (09:01 +0000)]
MDL-57550 forum: fix template validation issues
* Add some missing example contexts
* Stop using obsolete cell attributes
Dan Poltawski [Thu, 29 Dec 2016 19:35:22 +0000 (19:35 +0000)]
MDL-57550 forum: remove legacy js file
Dan Poltawski [Thu, 29 Dec 2016 19:32:57 +0000 (19:32 +0000)]
MDL-57550 forum: remove legacy forum.js uses
The search form options can be achieved in jquery rather than using
global js function/vars.
forum_get_subscribe_link legacylink had not been useful for some time
Dan Poltawski [Mon, 23 Jan 2017 09:28:32 +0000 (09:28 +0000)]
Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 23 Jan 2017 09:26:57 +0000 (09:26 +0000)]
Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle
Pau Ferrer Ocaña [Fri, 20 Jan 2017 11:57:36 +0000 (12:57 +0100)]
MDL-57737 glossary: Add entry description accepts HTML
Juan Leyva [Wed, 28 Dec 2016 14:19:18 +0000 (15:19 +0100)]
MDL-57408 tool_mobile: New setting for renaming app strings
Juan Leyva [Tue, 3 Jan 2017 11:59:05 +0000 (12:59 +0100)]
MDL-50547 mod_resource: New WS mod_resource_get_resources_by_courses
Rajesh Taneja [Fri, 20 Jan 2017 03:01:50 +0000 (11:01 +0800)]
MDL-57700 behat: Updated behat to 3.3.0 and fixed exception
John Beedell [Thu, 5 Jan 2017 14:34:41 +0000 (14:34 +0000)]
MDL-57511 Quiz: Attempts report shows non-unique debugging
Iñaki Arenaza [Sat, 6 Aug 2016 19:14:48 +0000 (21:14 +0200)]
MDL-50625 auth_ldap: Better check for paged results support
There is at least one LDAP server (Sun Directory Server) that doesn't
support Paged Results extension, even if it supports LDAP version 3. So
checking just for LDAP version is not enough.
If possible, we check the supportedControl attribute of the LDAP rootDSE
and see if the paged results control is available. This needs an LDAP
connection, which might not be possible to establish before we configure
some essential LDAP settings (server, bind user, password, etc.). Thus
we try to establish the connection and check the supportedControl
attribute. But if we fail, we perform only basic checks that are less
accurate and err on the side of cautiousness.
Andrew Nicols [Thu, 19 Jan 2017 04:17:46 +0000 (12:17 +0800)]
weekly release 3.3dev
Andrew Nicols [Thu, 19 Jan 2017 04:17:44 +0000 (12:17 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Wed, 18 Jan 2017 23:56:27 +0000 (07:56 +0800)]
MDL-57613 enrol_lti: Correct location of upgrade step
Tim Lock [Tue, 17 Jan 2017 01:50:26 +0000 (12:20 +1030)]
MDL-57668 mod_assign: Fix optional_param() form processing
Eloy Lafuente (stronk7) [Wed, 18 Jan 2017 18:23:59 +0000 (19:23 +0100)]
MDL-57570 static store: Basic serialize tests with igbinary
This unit test is not really verifying that internally igbinary
in being used but just igbinary availability and, by double
serializing, that it works for a semi-complex object.
The test will be skipped if igbinary is not available.
Stephen Bourget [Wed, 18 Jan 2017 15:35:11 +0000 (10:35 -0500)]
MDL-57415 user: Add missing bootstrap classes to participants page
Dan Marsden [Tue, 20 Dec 2016 09:56:50 +0000 (22:56 +1300)]
MDL-46782 mod_scorm: Load first incomplete sco on re-entry.
Andrew Nicols [Wed, 18 Jan 2017 08:00:06 +0000 (16:00 +0800)]
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 18 Jan 2017 07:42:52 +0000 (07:42 +0000)]
MDL-57604 mod_assign: fix empty case in user selector
Sadly the js arguments object gives an arguments.length of 1 when
no arguments are passed, so we have to explicitly check for it.
Andrew Nicols [Wed, 18 Jan 2017 04:51:59 +0000 (12:51 +0800)]
Merge branch 'wip-mdl-45821' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 18 Jan 2017 04:46:11 +0000 (12:46 +0800)]
MDL-45821 behat: navigate back to scorm to avoid scroll
On Exiting scrom activity, it goes back to course
and scrolls to section. On slow machines next step
fails. To avoid such case navigate to home screen
and then follow next step.
Andrew Nicols [Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)]
Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
Andrew Nicols [Wed, 18 Jan 2017 04:09:20 +0000 (12:09 +0800)]
Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 18 Jan 2017 00:36:58 +0000 (08:36 +0800)]
Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward/moodle
Eloy Lafuente (stronk7) [Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)]
Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 23:16:53 +0000 (00:16 +0100)]
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)]
Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 23:00:13 +0000 (00:00 +0100)]
Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:55:05 +0000 (20:55 +0100)]
Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)]
Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)]
Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle
David Mudrák [Tue, 17 Jan 2017 18:27:57 +0000 (19:27 +0100)]
MDL-57677 mod_forum: Fix wrong user displayed as the last post's author
In the recent issue MDL-56225, we started to record the current user as
the usermodified in the forum_discussions table when updating a forum
post. It made sense but it was a mistake.
Even if the current user really modifies the discussion by updating the
post, the field usermodified has actually been always interpreted and
displayed as the last post' author. Not as the last user who touched the
discussion.
This patch reverts that particular change to the previous behaviour and
adds explicit unit test for it.
AMOS bot [Tue, 17 Jan 2017 16:07:09 +0000 (00:07 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)]
Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)]
Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)]
Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 17 Jan 2017 06:52:07 +0000 (06:52 +0000)]
Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle
Jake Dallimore [Tue, 17 Jan 2017 05:13:08 +0000 (13:13 +0800)]
MDL-57287 themes: fix buttons in default dashboard page header
This fix modifies styling for pages having no navbar, such as the
dashboard, site home and default dashboard pages and fixes an overlap
problem with the buttons and context header.
Rajesh Taneja [Tue, 17 Jan 2017 02:30:45 +0000 (10:30 +0800)]
MDL-57669 behat: Exit with error code if step undefined
Dan Poltawski [Mon, 16 Jan 2017 16:20:05 +0000 (16:20 +0000)]
Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle
Dan Poltawski [Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)]
Merge branch 'MDL-57613-master' of https://github.com/xow/moodle
Mike Churchward [Wed, 11 Jan 2017 15:11:37 +0000 (10:11 -0500)]
MDL-57590 mod_forum: fixed search form with forumid and actionurl.
AMOS bot [Mon, 16 Jan 2017 16:07:54 +0000 (00:07 +0800)]
Automatically generated installer lang files
Stephen Bourget [Mon, 16 Jan 2017 15:54:33 +0000 (10:54 -0500)]
MDL-42266 Lib: Allow additional max upload file sizes
Dan Poltawski [Mon, 16 Jan 2017 13:34:06 +0000 (13:34 +0000)]
Merge branch 'MDL-57452_behat_completion_fix_master' of https://github.com/gthomas2/moodle
Dan Poltawski [Wed, 21 Dec 2016 13:38:50 +0000 (13:38 +0000)]
MDL-57490 javascript-static: remove legacy functions
1) Some previous deprecations are removed to reduce the amount of
code sent to the client
2) Other very-old functions are also sent to final deprecation
This is more agressive than our standard deprecation process, but with
the nature of this old js it seems the best way forward to reduce the
amount of obsolete js sent to clients.
Dan Poltawski [Wed, 21 Dec 2016 16:19:15 +0000 (16:19 +0000)]
MDL-57490 lesson: convert legacy js to jquery
Dan Poltawski [Wed, 21 Dec 2016 16:07:31 +0000 (16:07 +0000)]
MDL-57490 scorm: convert legacy js to jquery
Dan Poltawski [Wed, 21 Dec 2016 15:53:23 +0000 (15:53 +0000)]
MDL-57490 quiz: convert legacy js to jquery
Dan Poltawski [Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)]
Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)]
Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle
Dan Poltawski [Mon, 16 Jan 2017 11:17:58 +0000 (11:17 +0000)]
Merge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)]
Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)]
Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle
David Monllao [Mon, 16 Jan 2017 08:09:53 +0000 (09:09 +0100)]
Merge branch 'wip-mdl-57659' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 16 Jan 2017 08:01:23 +0000 (08:01 +0000)]
Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle
Rajesh Taneja [Mon, 16 Jan 2017 06:35:53 +0000 (14:35 +0800)]
MDL-57659 cache: Set default serializer to SERIALIZER_PHP
Dan Poltawski [Wed, 21 Dec 2016 11:09:48 +0000 (11:09 +0000)]
MDL-57488 js: remove M.util.focus_login_form/error
These are replaced by some simple jquery instead.
Pau Ferrer Ocaña [Mon, 2 Jan 2017 12:00:35 +0000 (13:00 +0100)]
MDL-57554 forum: Mark as read on view_forum_discussion calls
Pau Ferrer Ocaña [Wed, 11 Jan 2017 12:34:10 +0000 (13:34 +0100)]
MDL-57627 forum: Return if the user is tracking forum
John Okely [Fri, 13 Jan 2017 02:52:24 +0000 (10:52 +0800)]
MDL-57613 enrol_lti: Allow longer nonces
David Bogner [Tue, 13 Dec 2016 14:04:13 +0000 (15:04 +0100)]
MDL-57374 editor: Pasting plain text in Atto removes all styles/classes
AMOS bot [Thu, 12 Jan 2017 16:05:06 +0000 (00:05 +0800)]
Automatically generated installer lang files
Michael Aherne [Thu, 12 Jan 2017 12:30:39 +0000 (12:30 +0000)]
MDL-57634 messaging: Ensure test uses a configured plugin
gthomas2 [Mon, 19 Dec 2016 13:00:22 +0000 (13:00 +0000)]
MDL-57452 behat: Make completion check work with manual completion input
Dan Poltawski [Thu, 12 Jan 2017 07:42:26 +0000 (07:42 +0000)]
weekly release 3.3dev
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
Jake Dallimore [Thu, 12 Jan 2017 01:56:09 +0000 (09:56 +0800)]
MDL-57368 mod_feeback: fix drag and drop question reordering in boost
Jake Dallimore [Thu, 12 Jan 2017 01:54:40 +0000 (09:54 +0800)]
MDL-57368 templates: add example context to core_form/element-template
Dan Poltawski [Wed, 11 Jan 2017 09:50:03 +0000 (09:50 +0000)]
MDL-57608 media_videojs: lazily load videojs on demand
The videojs javascript is over 1MB of javascript which we don't need to
load on every page, now that we only require it demand, the js can be
lazily loaded when its needed, which keeps the first.js smaller and more
likely to stay in browser cache.
Dan Poltawski [Wed, 11 Jan 2017 10:03:39 +0000 (10:03 +0000)]
MDL-57608 media_videojs: fix third party locations
Marina Glancy [Wed, 11 Jan 2017 06:13:56 +0000 (14:13 +0800)]
MDL-57608 media_videojs: load youtube module only when requested
wehr [Thu, 5 Jan 2017 16:48:30 +0000 (17:48 +0100)]
MDL-57570 cache: Adds igbinary serializer to static cache store
Juan Leyva [Wed, 11 Jan 2017 15:56:25 +0000 (16:56 +0100)]
MDL-57629 webservice: Fix external functions phpdoc
Replace external_external_function_parameters with
external_function_parameters
Juan Leyva [Tue, 3 Jan 2017 10:59:51 +0000 (11:59 +0100)]
MDL-50542 mod_label: New WS mod_label_get_labels_by_courses
Juan Leyva [Tue, 3 Jan 2017 10:40:44 +0000 (11:40 +0100)]
MDL-50549 mod_url: New WS mod_url_get_urls_by_courses
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
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
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
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
sam marshall [Thu, 22 Dec 2016 15:31:25 +0000 (15:31 +0000)]
MDL-57515 Resource: 'not very efficient' with a large number of files
Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)
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
Dan Poltawski [Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)]
Merge branch 'MDL-57480-master' of https://github.com/snake/moodle
Marina Glancy [Tue, 10 Jan 2017 06:08:04 +0000 (14:08 +0800)]
MDL-56271 mod_feedback: recaptcha was not working
David Monllao [Tue, 10 Jan 2017 05:23:03 +0000 (06:23 +0100)]
Merge branch 'MDL-57149-master' 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
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.
