Dan Poltawski [Tue, 14 Jun 2016 16:15:01 +0000 (17:15 +0100)]
Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 14 Jun 2016 16:10:05 +0000 (17:10 +0100)]
Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 14 Jun 2016 15:55:26 +0000 (16:55 +0100)]
Merge branch 'MASTER_MDL-53306' of https://github.com/jacac/moodle
Dan Poltawski [Tue, 14 Jun 2016 15:41:46 +0000 (16:41 +0100)]
Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 14 Jun 2016 15:38:30 +0000 (16:38 +0100)]
Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle
Dan Poltawski [Tue, 14 Jun 2016 15:38:19 +0000 (16:38 +0100)]
Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 14 Jun 2016 07:33:49 +0000 (15:33 +0800)]
Merge branch 'MDL-54712-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 14 Jun 2016 06:15:27 +0000 (14:15 +0800)]
Merge branch 'MDL-54559-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 14 Jun 2016 05:24:47 +0000 (13:24 +0800)]
Merge branch 'MDL-54797' of git://github.com/aolley/moodle
Andrew Nicols [Tue, 14 Jun 2016 03:50:18 +0000 (11:50 +0800)]
Merge branch 'MDL-54787_master' of https://github.com/snake/moodle
Andrew Nicols [Tue, 14 Jun 2016 03:24:00 +0000 (11:24 +0800)]
Merge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/moodle
Andrew Nicols [Tue, 14 Jun 2016 03:00:28 +0000 (11:00 +0800)]
Merge branch 'MDL-54859_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 14 Jun 2016 01:05:53 +0000 (09:05 +0800)]
Merge branch 'MDL-52127-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 14 Jun 2016 00:49:41 +0000 (08:49 +0800)]
Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)]
Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:48:47 +0000 (09:48 +0100)]
Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 19 May 2016 11:45:34 +0000 (12:45 +0100)]
MDL-52127 grunt: fix coding style issues in gruntfile
Dan Poltawski [Fri, 13 May 2016 20:20:21 +0000 (21:20 +0100)]
MDL-52127 grunt: be aware of third party paths
1) Parse thirdpartylibs.xml and generate an array of third party
file paths to use in grunt tasks
2) In the lint tasks, we filter third party files from being linted
3) We add a new task to generate ignore files - currently for eslint,
but will be potentially useful for other things in the future
4) Remove .eslintignore from source control
Why have the ability to generate a .eslintignore file? For tooling
integration - by having the eslintignore file people can use other
eslint tools without having to just use grunt (e.g. editor
integrations).
Dan Poltawski [Sat, 14 May 2016 10:10:13 +0000 (11:10 +0100)]
MDL-52127 js: switch to a more YUI tolerant eslint config
Instead of having the stricter configuration for all files, use
the less strict default config and switch to the stricter config
for building AMD modules.
This means that the eslint commandline/editor inspections will work
better for all files and not generate false positives when using editor
integrations. But since grunt is required to build AMD modules we still
get the stricter checking for those files on build.
Dan Poltawski [Mon, 13 Jun 2016 08:35:58 +0000 (09:35 +0100)]
Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)]
Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 13 Jun 2016 07:51:56 +0000 (08:51 +0100)]
Merge branch 'MDL-54837-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 13 Jun 2016 07:36:38 +0000 (08:36 +0100)]
Merge branch 'MDL-54842-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 3 Jun 2016 02:10:06 +0000 (10:10 +0800)]
MDL-54772 mod_assign: Fixes for PDF editor
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
Andrew Nicols [Mon, 13 Jun 2016 01:17:53 +0000 (09:17 +0800)]
Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 11 May 2016 10:38:46 +0000 (11:38 +0100)]
MDL-52127 js: check YUI modules with eslint
Because we don't have the entire YUI rollup, we can't apply some of the
rules safely, so we ignore some rules.
At this point I am not 100% certain this configuration is robust enough,
to deal with the lack fo rollup knowledge although its a good sign that
there are no errors on our entire yui codebase.
Dan Poltawski [Wed, 11 May 2016 09:19:30 +0000 (10:19 +0100)]
MDL-52127 js: check amd files with eslint grunt task
I have spent quite a lot of time working through the current list of
eslint options and configuring them for Moodle style and I think this is
a very good basis to start us at (as well as taking some of out jshint
options out with https://www.npmjs.com/package/polyjuice ). Thanks to
Andrew Nicols, Mark Johnson and Frédéric Massart for some refinements.
With this configuration the grunt build will fail if errors are present
in the js (though you can of course tell jshint to ignore some errors,
as I have done in admin/tool/lp/amd/src/competency_rule_points.js and
defining the Y global in lib/amd/src/yui.js ).
The grunt task will not report warnings by default, but a new
--show-lint-warnings flag will help achieve that. Editor
integrations/stanadalone eslint tool will surely be a better way of
getting eslint errors rather than using the grunt task.
Jake Dallimore [Fri, 10 Jun 2016 06:29:28 +0000 (14:29 +0800)]
MDL-54787 mod_quiz: Fix notification error on regrade
Dan Poltawski [Sat, 14 May 2016 08:06:56 +0000 (09:06 +0100)]
MDL-54890 course: remove erranous duplicated switch label
Detected by eslint rule 'no-duplicate-case'
Dan Poltawski [Wed, 11 May 2016 15:42:15 +0000 (16:42 +0100)]
MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
Jun Pataleta [Wed, 8 Jun 2016 07:56:32 +0000 (15:56 +0800)]
MDL-54712 mod_lti: Remove markup from LTI admin notification messages
Jun Pataleta [Wed, 8 Jun 2016 05:16:07 +0000 (13:16 +0800)]
MDL-54842 core_renderer: Hide additional body HTML in embedded layout
Dan Poltawski [Thu, 9 Jun 2016 10:25:51 +0000 (11:25 +0100)]
weekly on-sync release 3.2dev
Dan Poltawski [Thu, 9 Jun 2016 10:25:49 +0000 (11:25 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 9 Jun 2016 01:53:48 +0000 (09:53 +0800)]
MDL-54853 weblib: Specify version and fixed encoding
Andrew Nicols [Thu, 9 Jun 2016 01:41:53 +0000 (09:41 +0800)]
Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle
Cameron Ball [Wed, 8 Jun 2016 07:55:56 +0000 (15:55 +0800)]
MDL-54853 weblib: Properly specify encoding for blanktarget
David Monllao [Wed, 8 Jun 2016 08:40:54 +0000 (16:40 +0800)]
MDL-54859 mod_wiki: Client rules only when fields are visible
Andrew Nicols [Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)]
Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 7 Jun 2016 11:15:19 +0000 (12:15 +0100)]
MDL-46721 assign: clarify ternerary statement
Dan Poltawski [Tue, 7 Jun 2016 11:12:28 +0000 (12:12 +0100)]
Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)]
Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 7 Jun 2016 09:44:27 +0000 (10:44 +0100)]
MDL-54729 mod_forum: clarify static variable usage
After some time discussing with integrators, we decided that this
slightly yukky solution probably fits safely, so just making its usage
better explained and speciifc.
Adrian Greeve [Tue, 31 May 2016 03:44:57 +0000 (11:44 +0800)]
MDL-54729 mod_forum: Deep link highlighting works in IE.
Dan Poltawski [Tue, 7 Jun 2016 08:41:27 +0000 (09:41 +0100)]
Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 7 Jun 2016 08:15:43 +0000 (16:15 +0800)]
Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle
Eric Merrill [Thu, 12 May 2016 18:01:56 +0000 (14:01 -0400)]
MDL-54559 theme: Fix padding that pushes navbar down
Skylar Kelty [Tue, 26 Apr 2016 07:35:00 +0000 (08:35 +0100)]
MDL-53947 memcached: Fix memcached session warning on PHP7
Marina Glancy [Tue, 7 Jun 2016 00:58:59 +0000 (08:58 +0800)]
MDL-54837 tags: allow to specify static function as callback
Marina Glancy [Mon, 6 Jun 2016 08:07:30 +0000 (16:07 +0800)]
MDL-54837 tags: fixed bug when collection is locked
also fixed fatal error for upgraded plugins that did not pass tag
component to the tag form element
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 22:04:59 +0000 (00:04 +0200)]
Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)]
Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 16:06:36 +0000 (18:06 +0200)]
Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 6 Jun 2016 14:07:01 +0000 (15:07 +0100)]
Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle
Dan Poltawski [Mon, 6 Jun 2016 13:09:59 +0000 (14:09 +0100)]
Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)]
Merge branch 'MDL-54702_master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:21:09 +0000 (13:21 +0100)]
Merge branch 'MDL-53392_master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:17:13 +0000 (13:17 +0100)]
Merge branch 'MDL-54557-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 6 Jun 2016 10:59:42 +0000 (11:59 +0100)]
Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)]
Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle
Mike Churchward [Thu, 2 Jun 2016 14:32:43 +0000 (10:32 -0400)]
MDL-54805 portfolio_download: Adding a 'require' of necessary library file
AMOS bot [Fri, 3 Jun 2016 16:04:17 +0000 (00:04 +0800)]
Automatically generated installer lang files
Juan Leyva [Fri, 3 Jun 2016 10:56:11 +0000 (12:56 +0200)]
MDL-54820 webservice: Fix regression in core_course_search_courses
Regression caused by MDL-51324
Jun Pataleta [Tue, 31 May 2016 10:09:21 +0000 (18:09 +0800)]
MDL-54765 mod_assign: Use selectedIndex for setting page selection
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
Frederic Massart [Tue, 24 May 2016 02:51:14 +0000 (10:51 +0800)]
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished
Andrew Nicols [Fri, 3 Jun 2016 04:09:19 +0000 (12:09 +0800)]
weekly on-sync release 3.2dev
Andrew Nicols [Fri, 3 Jun 2016 04:09:16 +0000 (12:09 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Simey Lameze [Fri, 3 Jun 2016 02:34:53 +0000 (10:34 +0800)]
MDL-54739 blocks: fix activity chooser link alignment
Thanks Ryan Wyllie for the help.
Clement Smith [Tue, 31 May 2016 19:05:44 +0000 (14:05 -0500)]
MDL-50824 message/externallib.php: Fix get_string call
This fixes the get_string call by adding the intended recipient's
fullname as the third argument when a user tries to message the
recipient, the recipient is blocking non-contacts from messaging
them, and the user is not in the recipient's contact list.
Adam Olley [Thu, 2 Jun 2016 06:12:16 +0000 (15:42 +0930)]
MDL-54797 course: Add indexed field to condition of delete query
Deleting records from the course_completion_criteria table goes much
faster when we include the indexed course field in the delete query.
Marina Glancy [Mon, 16 May 2016 00:36:42 +0000 (08:36 +0800)]
MDL-54557 course: treat section summary as contents
Andrew Nicols [Thu, 2 Jun 2016 02:07:52 +0000 (10:07 +0800)]
MDL-54722 javascript: Add YUI depend wrapper to global event
AMOS bot [Wed, 1 Jun 2016 16:04:13 +0000 (00:04 +0800)]
Automatically generated installer lang files
Frederic Massart [Wed, 1 Jun 2016 05:45:47 +0000 (13:45 +0800)]
MDL-48248 enrol_manual: Handle durations more precise than int days
Frederic Massart [Tue, 31 May 2016 11:28:11 +0000 (19:28 +0800)]
MDL-48756 editor_atto: Bulk atto autosave queries
Andrew Nicols [Wed, 1 Jun 2016 04:24:14 +0000 (12:24 +0800)]
Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle
Stephen Bourget [Fri, 13 May 2016 01:35:39 +0000 (21:35 -0400)]
MDL-54563 Block: Only Allow completion blocks on course pages
Cameron Ball [Tue, 31 May 2016 08:56:09 +0000 (16:56 +0800)]
MDL-54722 navigation: Properly overflow expanded nav trees
Jake Dallimore [Fri, 27 May 2016 08:49:38 +0000 (16:49 +0800)]
MDL-54702 mod_lti: Support standard cartridge icons in LTI import
Marina Glancy [Tue, 31 May 2016 02:37:08 +0000 (10:37 +0800)]
MDL-54769 backup: add missing error language string
Andrew Nicols [Wed, 1 Jun 2016 00:02:32 +0000 (08:02 +0800)]
Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle
Mark Johnson [Thu, 12 May 2016 08:49:24 +0000 (09:49 +0100)]
MDL-54180 Behat: Handle exceptions from driver when saving screenshot
Marina Glancy [Thu, 26 May 2016 09:18:13 +0000 (17:18 +0800)]
MDL-53598 block_glossary_random: do not fail if glossary was deleted
This commit refactors how associated glossary is searched for and removes
unnecessary DB queries. Also prevents from situations when the global glossary or course have
been deleted
David Monllao [Tue, 31 May 2016 07:27:29 +0000 (15:27 +0800)]
Merge branch 'MDL-54065-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)]
Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle
David Monllao [Tue, 31 May 2016 04:46:59 +0000 (12:46 +0800)]
Merge branch 'MDL-54667-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 31 May 2016 04:31:36 +0000 (12:31 +0800)]
Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle
David Monllao [Tue, 31 May 2016 03:46:09 +0000 (11:46 +0800)]
Merge branch 'MDL-53851-master' of https://github.com/blckct/moodle
David Monllao [Tue, 31 May 2016 03:42:17 +0000 (11:42 +0800)]
Merge branch 'MDL-53938' of git://github.com/timhunt/moodle
David Monllao [Tue, 31 May 2016 03:32:11 +0000 (11:32 +0800)]
Merge branch 'MDL-54605' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 31 May 2016 03:18:27 +0000 (11:18 +0800)]
Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle
Barbara Ramiro [Thu, 26 May 2016 02:47:23 +0000 (10:47 +0800)]
MDL-51683 design: New icon for competencies
Jakob [Fri, 4 Mar 2016 19:02:34 +0000 (11:02 -0800)]
MDL-53306 auth: Add hook for auth plugins to access user object.
Add a hook for auth plugins to be able to modify or check a user, before
raising any authentication errors.
The auth plugin needs to add a public function like this:
/**
* Pre user_login hook.
* This method is called from authenticate_user_login() right after the user
* object is generated. This gives the auth plugins an option to make adjustments
* before the verification process starts.
*
* @param object $user user object, later used for $USER
*/
public function pre_user_login_hook(&$user) {
// Override if needed.
}
Jakub Kania [Mon, 23 May 2016 15:39:12 +0000 (17:39 +0200)]
MDL-54667 core_lib: Fix the param name in edit profile link
Cameron Ball [Mon, 30 May 2016 07:19:36 +0000 (15:19 +0800)]
MDL-37138 weblib: Document blanktarget in upgrade.txt
David Monllao [Mon, 30 May 2016 08:08:53 +0000 (16:08 +0800)]
Merge branch 'MDL-54002_m32v3' of https://github.com/sbourget/moodle
David Monllao [Mon, 30 May 2016 08:04:04 +0000 (16:04 +0800)]
Merge branch 'MDL-54010-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 07:45:47 +0000 (15:45 +0800)]
Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 07:40:43 +0000 (15:40 +0800)]
Merge branch 'MDL-29905-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 30 May 2016 07:36:01 +0000 (15:36 +0800)]
Merge branch 'MDL-54116-master' of git://github.com/cameron1729/moodle