79028 Commits

Author SHA1 Message Date
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Eloy Lafuente (stronk7)
49619ce243 weekly release 3.2dev 2016-06-16 17:01:29 +02:00
Eloy Lafuente (stronk7)
badd6b2344 NOBUG: Fixed SVG browser compatibility 2016-06-16 17:01:25 +02:00
Andrew Nicols
eddf7994f0 Merge branch 'MDL-52127-eloy' of https://github.com/danpoltawski/moodle 2016-06-16 09:04:17 +01:00
Andrew Nicols
c3081f9fac Merge branch 'wip-mdl-54899' of git://github.com/rajeshtaneja/moodle 2016-06-16 09:04:16 +01:00
Andrew Nicols
d91b6854e9 Merge branch 'MDL-45762-master' of https://github.com/xow/moodle 2016-06-16 09:04:16 +01:00
Andrew Nicols
a029e5212d Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle 2016-06-16 09:04:15 +01:00
Andrew Nicols
00f99e270a Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:14 +01:00
Andrew Nicols
5869e4b74f Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle 2016-06-16 09:04:14 +01:00
Eric Merrill
9c6a38063b MDL-54559 theme: Recenter search box 2016-06-16 09:04:13 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
7d78a2eee2 Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
d7c9327d48 Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:11 +01:00
Dan Poltawski
134e4566ff Merge branch 'MASTER_MDL-53306' of https://github.com/jacac/moodle 2016-06-16 09:04:10 +01:00
Dan Poltawski
435fb13814 Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle 2016-06-16 09:04:10 +01:00
Dan Poltawski
4f400df523 Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle 2016-06-16 09:04:09 +01:00
Dan Poltawski
b08523598b Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle 2016-06-16 09:04:09 +01:00
Andrew Nicols
62bc2e84c5 Merge branch 'MDL-54712-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:08 +01:00
Andrew Nicols
168b1d9885 Merge branch 'MDL-54559-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:08 +01:00
Andrew Nicols
45a0932a9e Merge branch 'MDL-54797' of git://github.com/aolley/moodle 2016-06-16 09:04:07 +01:00
Andrew Nicols
337ee7ffa2 Merge branch 'MDL-54787_master' of https://github.com/snake/moodle 2016-06-16 09:04:07 +01:00
Andrew Nicols
1e7aaed887 Merge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/moodle 2016-06-16 09:04:06 +01:00
Andrew Nicols
de0298d5fd Merge branch 'MDL-54859_master' of git://github.com/dmonllao/moodle 2016-06-16 09:04:05 +01:00
Andrew Nicols
bb15b62ce8 Merge branch 'MDL-52127-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:05 +01:00
Andrew Nicols
860f76e11e Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle 2016-06-16 09:04:04 +01:00
Eloy Lafuente (stronk7)
392c40467f Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:04 +01:00
Dan Poltawski
d13f2a6934 Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle 2016-06-16 09:04:03 +01:00
Dan Poltawski
f8731225f9 MDL-52127 grunt: add .eslingingore file, keep task
Eloy prefers we keep the ignorefiles grunt task
2016-06-15 15:52:34 +01:00
Guy Thomas
8e61e0f9b9 MDL-45762 course: Error when accessing a conditionally hidden section
Show a nice error when the user accidentally views a section
that is conditionally hidden.  Otherwise, continue to show
original error when section is just hidden to them.
2016-06-15 09:53:35 +08:00
Nicholas Hoobin
1512f61710 MDL-53788 multilangupgrade: fix aggressive course cache rebuilding 2016-06-15 10:49:28 +10:00
Nicholas Hoobin
2abe0ac5a9 MDL-53788 user: fix aggressive course cache rebuilding 2016-06-15 10:42:28 +10:00
Nicholas Hoobin
99a5377bb7 MDL-53788 mod_lti: fix aggressive course cache rebuilding 2016-06-15 10:42:27 +10:00
Dan Poltawski
b18478b935 MDL-52127 grunt: fix coding style issues in gruntfile 2016-06-14 00:37:29 +01:00
Dan Poltawski
30db70abdc 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).
2016-06-14 00:37:29 +01:00
Dan Poltawski
be4b3cc6c7 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.
2016-06-14 00:37:28 +01:00
Dan Poltawski
d25e8fde45 Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle 2016-06-13 09:35:58 +01:00
Dan Poltawski
88b0045106 Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle 2016-06-13 09:17:49 +01:00
Dan Poltawski
f3caf30690 Merge branch 'MDL-54837-master' of git://github.com/marinaglancy/moodle 2016-06-13 08:51:56 +01:00
Dan Poltawski
8d7bd87e6e Merge branch 'MDL-54842-master' of git://github.com/junpataleta/moodle 2016-06-13 08:36:38 +01:00
Jun Pataleta
cdbdb2f9b7 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.
2016-06-13 09:54:02 +08:00
Andrew Nicols
377b29d826 Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle 2016-06-13 09:17:53 +08:00
Rajesh Taneja
ac22c86bed MDL-54899 behat: Tag for MOODLE 32 version 2016-06-13 07:26:51 +08:00
Dan Poltawski
a1587268cb 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.
2016-06-11 10:14:35 +01:00
Dan Poltawski
3adb62b727 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.
2016-06-11 10:14:35 +01:00
Jake Dallimore
cd6dfd68d8 MDL-54787 mod_quiz: Fix notification error on regrade 2016-06-10 18:26:30 +08:00
Dan Poltawski
834f1b66d4 MDL-54890 course: remove erranous duplicated switch label
Detected by eslint rule 'no-duplicate-case'
2016-06-10 10:06:28 +01:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
2016-06-10 10:06:25 +01:00
Jun Pataleta
93f3988cf7 MDL-54712 mod_lti: Remove markup from LTI admin notification messages 2016-06-10 15:10:45 +08:00
Jun Pataleta
5d01400a85 MDL-54842 core_renderer: Hide additional body HTML in embedded layout 2016-06-10 14:47:14 +08:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00