moodle.git
6 years agoMerge branch 'MDL-54881' of https://github.com/mr-russ/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)]
Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle

6 years agoMerge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:26:42 +0000 (11:26 +0800)]
Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:18:03 +0000 (11:18 +0800)]
Merge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle

6 years agoMDL-35104 auth: Don't allow modification of username
Cameron Ball [Tue, 31 May 2016 09:56:33 +0000 (17:56 +0800)]
MDL-35104 auth: Don't allow modification of username

Presently it is either unreliable, or not possible to change
the username of a user created with an authentication plugin.
In some cases it is even hard coded to fail. Ideally we would
sync the username, and the issue MDL-21928 exists to address
that. However, in the mean time we should not allow the
username of an external user to be modified.

6 years agoMerge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)]
Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 21 Jun 2016 01:58:18 +0000 (09:58 +0800)]
Merge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle
Andrew Nicols [Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)]
Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle

6 years agoMerge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 21 Jun 2016 00:46:38 +0000 (08:46 +0800)]
Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle

6 years agoMDL-54881 quiz: Ensure user attempts are deterministic for testing.
Russell Smith [Mon, 20 Jun 2016 22:31:26 +0000 (08:31 +1000)]
MDL-54881 quiz: Ensure user attempts are deterministic for testing.

6 years agoMerge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)]
Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle
Andrew Nicols [Mon, 20 Jun 2016 06:09:54 +0000 (14:09 +0800)]
Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle

6 years agoMDL-54590 Installer: Additional info about database name
Vadim Dvorovenko [Sat, 28 May 2016 16:07:16 +0000 (23:07 +0700)]
MDL-54590 Installer: Additional info about database name

Additional info that creating database name containing dots is not
   supported

6 years agoMerge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Mon, 20 Jun 2016 03:09:47 +0000 (11:09 +0800)]
Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle

6 years agoMDL-54654 mod: fix forum/scorm invalid css
Dan Poltawski [Fri, 20 May 2016 15:24:26 +0000 (16:24 +0100)]
MDL-54654 mod: fix forum/scorm invalid css

6 years agoMDL-54654 mod_data: fix invalid css for image gallery preset
Dan Poltawski [Fri, 20 May 2016 11:30:23 +0000 (12:30 +0100)]
MDL-54654 mod_data: fix invalid css for image gallery preset

6 years agoMDL-54654 choice: remove CSS definitions
Dan Poltawski [Fri, 20 May 2016 11:11:37 +0000 (12:11 +0100)]
MDL-54654 choice: remove CSS definitions

The 'inherit' for border colour was not valid and so no border was
displayed.

The display:inline does not work with floated elemenets.

6 years agoMDL-54654 choice: reformat CSS
Dan Poltawski [Fri, 20 May 2016 11:17:07 +0000 (12:17 +0100)]
MDL-54654 choice: reformat CSS

6 years agoMDL-54654 book: silence csslint warning
Dan Poltawski [Fri, 20 May 2016 11:02:40 +0000 (12:02 +0100)]
MDL-54654 book: silence csslint warning

(Important is by design for print layout)

6 years agoMDL-54654 assignfeedback_editpdf: remove invalid CSS
Dan Poltawski [Fri, 20 May 2016 11:00:08 +0000 (12:00 +0100)]
MDL-54654 assignfeedback_editpdf: remove invalid CSS

The 'left' positioing was invalid and conflicting with the
right definition anyway, so wasn't necessary.

6 years agoMDL-54652 singleview: remove invalid css decleration
Dan Poltawski [Thu, 19 May 2016 22:25:32 +0000 (23:25 +0100)]
MDL-54652 singleview: remove invalid css decleration

margin-bottom can't be used with display: inline, so use padding
instead.

6 years agoMDL-54652 grade_report: fix css lint issues
Dan Poltawski [Thu, 19 May 2016 22:14:41 +0000 (23:14 +0100)]
MDL-54652 grade_report: fix css lint issues

max-width: initial isn't valid css and in my testing it makes no
difference, so is removed.

We also remove invalid css on exception.

This reverts commit 72ece42858643c789d2c2f86fccdab0afefa18d0

6 years agoMDL-54652 block_community: remove unused css
Dan Poltawski [Thu, 19 May 2016 16:47:50 +0000 (17:47 +0100)]
MDL-54652 block_community: remove unused css

Fixing lint errors

6 years agoMDL-54652 filter_mediaplugin: refomat css
Dan Poltawski [Thu, 19 May 2016 16:41:47 +0000 (17:41 +0100)]
MDL-54652 filter_mediaplugin: refomat css

6 years agoMDL-54652 filter_mediaplugin: removed unused invalid css
Dan Poltawski [Thu, 19 May 2016 16:40:57 +0000 (17:40 +0100)]
MDL-54652 filter_mediaplugin: removed unused invalid css

It is override by core styles anyway.

6 years agoMDL-54652 tool_lp: remove invalid css on comeptency menu bar
Dan Poltawski [Thu, 19 May 2016 16:24:34 +0000 (17:24 +0100)]
MDL-54652 tool_lp: remove invalid css on comeptency menu bar

6 years agoMDL-54652 tool_health: make css more specific to avoid '!important'
Dan Poltawski [Thu, 19 May 2016 16:16:45 +0000 (17:16 +0100)]
MDL-54652 tool_health: make css more specific to avoid '!important'

This admin tool is unsupported anyway..

6 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 16 Jun 2016 15:01:29 +0000 (17:01 +0200)]
weekly release 3.2dev

6 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Thu, 16 Jun 2016 15:01:25 +0000 (17:01 +0200)]
NOBUG: Fixed SVG browser compatibility

6 years agoMerge branch 'MDL-52127-eloy' of https://github.com/danpoltawski/moodle
Andrew Nicols [Thu, 16 Jun 2016 02:38:19 +0000 (10:38 +0800)]
Merge branch 'MDL-52127-eloy' of https://github.com/danpoltawski/moodle

6 years agoMerge branch 'wip-mdl-54899' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 15 Jun 2016 01:58:53 +0000 (09:58 +0800)]
Merge branch 'wip-mdl-54899' of git://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-45762-master' of https://github.com/xow/moodle
Andrew Nicols [Wed, 15 Jun 2016 01:54:49 +0000 (09:54 +0800)]
Merge branch 'MDL-45762-master' of https://github.com/xow/moodle

6 years agoMerge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle
Andrew Nicols [Wed, 15 Jun 2016 01:10:43 +0000 (09:10 +0800)]
Merge branch 'MDL-53788_modlti_master' of git://github.com/nhoobin/moodle

6 years agoMerge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 15 Jun 2016 00:46:17 +0000 (08:46 +0800)]
Merge branch 'MDL-54649-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle
Andrew Nicols [Wed, 15 Jun 2016 00:23:25 +0000 (08:23 +0800)]
Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle

6 years agoMDL-54559 theme: Recenter search box
Eric Merrill [Tue, 14 Jun 2016 15:00:01 +0000 (11:00 -0400)]
MDL-54559 theme: Recenter search box

6 years agoMerge branch 'MDL-35628' of https://github.com/mr-russ/moodle
Dan Poltawski [Tue, 14 Jun 2016 16:25:56 +0000 (17:25 +0100)]
Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle

6 years agoMerge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 14 Jun 2016 16:15:01 +0000 (17:15 +0100)]
Merge branch 'MDL-54563-master' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-51749-master' of git://github.com/junpataleta/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

6 years agoMerge branch 'MASTER_MDL-53306' of https://github.com/jacac/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

6 years agoMerge branch 'MDL-54617-master' of git://github.com/cameron1729/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

6 years agoMerge branch 'MDL-54036_master' of https://github.com/liorgil/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

6 years agoMerge branch 'MDL-54622_m32v1' of https://github.com/sbourget/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

6 years agoMerge branch 'MDL-54712-master' of git://github.com/junpataleta/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

6 years agoMerge branch 'MDL-54559-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

6 years agoMerge branch 'MDL-54797' of git://github.com/aolley/moodle
Andrew Nicols [Tue, 14 Jun 2016 05:24:47 +0000 (13:24 +0800)]
Merge branch 'MDL-54797' of git://github.com/aolley/moodle

6 years agoMerge branch 'MDL-54787_master' of https://github.com/snake/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

6 years agoMerge branch 'MDL-54576_themeSelector' of https://github.com/mrmark/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

6 years agoMerge branch 'MDL-54859_master' of git://github.com/dmonllao/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

6 years agoMerge branch 'MDL-52127-master' of git://github.com/danpoltawski/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

6 years agoMerge branch 'MDL-51978-master' of https://github.com/jtc/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

6 years agoMerge branch 'MDL-54890-master' of git://github.com/danpoltawski/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

6 years agoMerge branch 'MDL-51683-master' of git://github.com/FMCorz/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

6 years agoMDL-52127 grunt: add .eslingingore file, keep task
Dan Poltawski [Wed, 15 Jun 2016 14:50:46 +0000 (15:50 +0100)]
MDL-52127 grunt: add .eslingingore file, keep task

Eloy prefers we keep the ignorefiles grunt task

6 years agoMDL-45762 course: Error when accessing a conditionally hidden section
Guy Thomas [Tue, 3 Jun 2014 16:57:23 +0000 (09:57 -0700)]
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.

6 years agoMDL-53788 multilangupgrade: fix aggressive course cache rebuilding
Nicholas Hoobin [Wed, 15 Jun 2016 00:49:28 +0000 (10:49 +1000)]
MDL-53788 multilangupgrade: fix aggressive course cache rebuilding

6 years agoMDL-53788 user: fix aggressive course cache rebuilding
Nicholas Hoobin [Tue, 3 May 2016 04:29:20 +0000 (14:29 +1000)]
MDL-53788 user: fix aggressive course cache rebuilding

6 years agoMDL-53788 mod_lti: fix aggressive course cache rebuilding
Nicholas Hoobin [Tue, 3 May 2016 04:25:51 +0000 (14:25 +1000)]
MDL-53788 mod_lti: fix aggressive course cache rebuilding

6 years agoMDL-52127 grunt: fix coding style issues in gruntfile
Dan Poltawski [Thu, 19 May 2016 11:45:34 +0000 (12:45 +0100)]
MDL-52127 grunt: fix coding style issues in gruntfile

6 years agoMDL-52127 grunt: be aware of third party paths
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).

6 years agoMDL-52127 js: switch to a more YUI tolerant eslint config
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.

6 years agoMerge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:35:58 +0000 (09:35 +0100)]
Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle

6 years agoMDL-51505 tool_templatelibrary: Prevent jumping when selecting template
Joby Harding [Sun, 12 Jun 2016 17:07:36 +0000 (18:07 +0100)]
MDL-51505 tool_templatelibrary: Prevent jumping when selecting template

6 years agoMerge branch 'MDL-54562_master' of git://github.com/dmonllao/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

6 years agoMerge branch 'MDL-54837-master' of git://github.com/marinaglancy/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

6 years agoMerge branch 'MDL-54842-master' of git://github.com/junpataleta/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

6 years agoMDL-53292 core: deprecate callback delete_course
Marina Glancy [Tue, 1 Mar 2016 02:51:37 +0000 (10:51 +0800)]
MDL-53292 core: deprecate callback delete_course

6 years agoMDL-51163 course: Remove course/category.php
Cameron Ball [Fri, 8 Jan 2016 06:02:47 +0000 (14:02 +0800)]
MDL-51163 course: Remove course/category.php

6 years agoMDL-37554 activities select all option
eWallah [Sun, 27 Mar 2016 00:50:01 +0000 (18:50 -0600)]
MDL-37554 activities select all option

6 years agoMDL-54772 mod_assign: Fixes for PDF editor
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.

6 years agoMerge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 13 Jun 2016 01:17:53 +0000 (09:17 +0800)]
Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle

6 years agoMDL-54899 behat: Tag for MOODLE 32 version
Rajesh Taneja [Sun, 12 Jun 2016 23:26:14 +0000 (07:26 +0800)]
MDL-54899 behat: Tag for MOODLE 32 version

6 years agoMDL-52127 js: check YUI modules with eslint
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.

6 years agoMDL-52127 js: check amd files with eslint grunt task
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.

6 years agoMDL-54787 mod_quiz: Fix notification error on regrade
Jake Dallimore [Fri, 10 Jun 2016 06:29:28 +0000 (14:29 +0800)]
MDL-54787 mod_quiz: Fix notification error on regrade

6 years agoMDL-54890 course: remove erranous duplicated switch label
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'

6 years agoMDL-54890 assignfeedback_editpdf: Fix missing semicolon
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'

6 years agoMDL-54712 mod_lti: Remove markup from LTI admin notification messages
Jun Pataleta [Wed, 8 Jun 2016 07:56:32 +0000 (15:56 +0800)]
MDL-54712 mod_lti: Remove markup from LTI admin notification messages

6 years agoMDL-54842 core_renderer: Hide additional body HTML in embedded layout
Jun Pataleta [Wed, 8 Jun 2016 05:16:07 +0000 (13:16 +0800)]
MDL-54842 core_renderer: Hide additional body HTML in embedded layout

6 years agoMDL-35628 performance: Remove dirname() where possible.
Russell Smith [Fri, 26 Feb 2016 06:47:58 +0000 (17:47 +1100)]
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.

6 years agoweekly on-sync release 3.2dev
Dan Poltawski [Thu, 9 Jun 2016 10:25:51 +0000 (11:25 +0100)]
weekly on-sync release 3.2dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

6 years agoMDL-54853 weblib: Specify version and fixed encoding
Andrew Nicols [Thu, 9 Jun 2016 01:53:48 +0000 (09:53 +0800)]
MDL-54853 weblib: Specify version and fixed encoding

6 years agoMerge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Thu, 9 Jun 2016 01:41:53 +0000 (09:41 +0800)]
Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle

6 years agoMDL-54853 weblib: Properly specify encoding for blanktarget
Cameron Ball [Wed, 8 Jun 2016 07:55:56 +0000 (15:55 +0800)]
MDL-54853 weblib: Properly specify encoding for blanktarget

6 years agoMDL-54859 mod_wiki: Client rules only when fields are visible
David Monllao [Wed, 8 Jun 2016 08:40:54 +0000 (16:40 +0800)]
MDL-54859 mod_wiki: Client rules only when fields are visible

6 years agoMerge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)]
Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle

6 years agoMDL-46721 assign: clarify ternerary statement
Dan Poltawski [Tue, 7 Jun 2016 11:15:19 +0000 (12:15 +0100)]
MDL-46721 assign: clarify ternerary statement

6 years agoMerge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 7 Jun 2016 11:12:28 +0000 (12:12 +0100)]
Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-48756-master' of git://github.com/FMCorz/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

6 years agoMDL-54729 mod_forum: clarify static variable usage
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.

6 years agoMDL-54729 mod_forum: Deep link highlighting works in IE.
Adrian Greeve [Tue, 31 May 2016 03:44:57 +0000 (11:44 +0800)]
MDL-54729 mod_forum: Deep link highlighting works in IE.

6 years agoMerge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 7 Jun 2016 08:41:27 +0000 (09:41 +0100)]
Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-54180_master' of https://github.com/marxjohnson/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

6 years agoMDL-54559 theme: Fix padding that pushes navbar down
Eric Merrill [Thu, 12 May 2016 18:01:56 +0000 (14:01 -0400)]
MDL-54559 theme: Fix padding that pushes navbar down

6 years agoMDL-53947 memcached: Fix memcached session warning on PHP7
Skylar Kelty [Tue, 26 Apr 2016 07:35:00 +0000 (08:35 +0100)]
MDL-53947 memcached: Fix memcached session warning on PHP7

6 years agoMDL-54837 tags: allow to specify static function as callback
Marina Glancy [Tue, 7 Jun 2016 00:58:59 +0000 (08:58 +0800)]
MDL-54837 tags: allow to specify static function as callback

6 years agoMDL-54837 tags: fixed bug when collection is locked
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

6 years agoMerge branch 'MDL-54739-master' of git://github.com/lameze/moodle
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

6 years agoMerge branch 'MDL-54769-master' of git://github.com/marinaglancy/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

6 years agoMerge branch 'MDL-54805-master' of git://github.com/junpataleta/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