Joby Harding
def383943b
MDL-51505 tool_templatelibrary: Prevent jumping when selecting template
2016-06-13 09:30:37 +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
Marina Glancy
8fef061da4
MDL-53292 core: deprecate callback delete_course
2016-06-13 10:48:06 +08:00
Cameron Ball
3f897b1966
MDL-51163 course: Remove course/category.php
2016-06-13 10:24:15 +08:00
eWallah
6ae9dbc2aa
MDL-37554 activities select all option
2016-06-13 10:22:16 +08: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
Stephen Bourget
1e93eb58ce
MDL-54656 Behat: Additional tests for advanced search
2016-06-12 20:50:46 -04:00
Stephen Bourget
a6540f38ce
MDL-54656 Behat: Add tests for search_forums block
2016-06-12 20:50:21 -04: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
Rajesh Taneja
06b2c25662
MDL-48114 core: Add meta information to composer.json
2016-06-10 06:29:16 +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
Stephen Bourget
fb8b18a44d
MDL-53111 Lesson: Allow "end reached" criteria to be disabled
2016-06-09 12:18:34 -04:00
Dan Poltawski
a0a63678a9
weekly on-sync release 3.2dev
2016-06-09 11:25:51 +01:00
Dan Poltawski
b86bba12d7
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-06-09 11:25:49 +01:00
Andrew Nicols
2c4e6d6252
MDL-54853 weblib: Specify version and fixed encoding
2016-06-09 09:53:48 +08:00
Andrew Nicols
360e819fd3
Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle
2016-06-09 09:41:53 +08:00
Cameron Ball
2549f46f7c
MDL-54853 weblib: Properly specify encoding for blanktarget
2016-06-08 18:29:19 +08:00
David Monllao
dc4c357435
MDL-54859 mod_wiki: Client rules only when fields are visible
2016-06-08 16:44:45 +08:00
Russell Smith
0b768e744f
MDL-53495 database xmldb: Use real length restriction.
2016-06-08 11:06:16 +10:00
Andrew Nicols
147df77923
Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
2016-06-08 08:15:23 +08:00
Dan Poltawski
631edc10ae
MDL-46721 assign: clarify ternerary statement
2016-06-07 12:15:19 +01:00
Dan Poltawski
db417025d7
Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle
2016-06-07 12:12:28 +01:00
Dan Poltawski
7bcab9d1fd
Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle
2016-06-07 11:49:39 +01:00
Dan Poltawski
654e77e74d
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.
2016-06-07 10:46:53 +01:00
Adrian Greeve
09fec72819
MDL-54729 mod_forum: Deep link highlighting works in IE.
2016-06-07 10:30:18 +01:00
Dan Poltawski
df4af29945
Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle
2016-06-07 09:41:27 +01:00
David Monllao
8a4f4f576e
Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle
2016-06-07 16:15:43 +08:00
Eric Merrill
677650c327
MDL-54559 theme: Fix padding that pushes navbar down
2016-06-07 14:52:26 +08:00
Skylar Kelty
1f5a347b46
MDL-53947 memcached: Fix memcached session warning on PHP7
2016-06-07 10:25:07 +08:00
Marina Glancy
64e9180d2e
MDL-54837 tags: allow to specify static function as callback
2016-06-07 08:58:59 +08:00
Marina Glancy
6ee5e596b8
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
2016-06-07 08:38:39 +08:00
Eloy Lafuente (stronk7)
31220d5a26
Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle
2016-06-07 00:04:59 +02:00
Eloy Lafuente (stronk7)
512f9def5c
Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle
2016-06-06 23:56:25 +02:00
Eloy Lafuente (stronk7)
ccbb50d2e2
Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle
2016-06-06 18:06:36 +02:00
Dan Poltawski
4bfeaf2d5f
Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle
2016-06-06 15:07:01 +01:00
Dan Poltawski
015b4d22a2
Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle
2016-06-06 14:09:59 +01:00
Dan Poltawski
5bd52435b4
Merge branch 'MDL-54702_master' of https://github.com/snake/moodle
2016-06-06 13:41:48 +01:00
Dan Poltawski
e750544a06
Merge branch 'MDL-53392_master' of https://github.com/snake/moodle
2016-06-06 13:21:09 +01:00
Dan Poltawski
53ee327c69
Merge branch 'MDL-54557-master' of git://github.com/marinaglancy/moodle
2016-06-06 13:17:13 +01:00
Dan Poltawski
a7de32a265
Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle
2016-06-06 11:59:42 +01:00