moodle.git
5 years agoMDL-50937 jquery: remove instances of migrate plugin
Dan Poltawski [Tue, 19 Jul 2016 09:34:17 +0000 (10:34 +0100)]
MDL-50937 jquery: remove instances of migrate plugin

5 years agoMerge branch 'MDL-50937-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 19 Jul 2016 09:27:10 +0000 (10:27 +0100)]
Merge branch 'MDL-50937-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-54915-master' of http://github.com/damyon/moodle
Dan Poltawski [Tue, 19 Jul 2016 08:38:23 +0000 (09:38 +0100)]
Merge branch 'MDL-54915-master' of github.com/damyon/moodle

5 years agoRevert "Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle"
Dan Poltawski [Tue, 19 Jul 2016 08:37:01 +0000 (09:37 +0100)]
Revert "Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle"

This reverts commit fa57043eb695d8c52755cf96c7b0034fb130398b, reversing
changes made to 36a19ecc26d9299af09e7bec9e8dfa99729e1973.

5 years agoMerge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 19 Jul 2016 07:29:41 +0000 (09:29 +0200)]
Merge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/upgrade.txt

5 years agoMerge branch 'MDL-55141' of https://github.com/creator23/moodle
David Monllao [Tue, 19 Jul 2016 06:58:09 +0000 (08:58 +0200)]
Merge branch 'MDL-55141' of https://github.com/creator23/moodle

5 years agoMerge branch 'MDL-49599-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 19 Jul 2016 06:53:28 +0000 (08:53 +0200)]
Merge branch 'MDL-49599-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-49599 core: Fully deprecate the boxclient class
Andrew Nicols [Mon, 11 Jul 2016 07:27:52 +0000 (15:27 +0800)]
MDL-49599 core: Fully deprecate the boxclient class

5 years agoMerge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle
David Monllao [Tue, 19 Jul 2016 06:41:29 +0000 (08:41 +0200)]
Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle

5 years agoMDL-54915 templates: Fix async rendering of js blocks
Damyon Wiese [Tue, 19 Jul 2016 04:02:28 +0000 (12:02 +0800)]
MDL-54915 templates: Fix async rendering of js blocks

Mustache JS helper can overwrite JS blocks when using nested templates.

Each call to render should have it's own scope.

5 years agoMDL-55157 mod_feedback: Deprecate unused strings
Stephen Bourget [Wed, 13 Jul 2016 22:26:17 +0000 (18:26 -0400)]
MDL-55157 mod_feedback: Deprecate unused strings

5 years agoMDL-55157 mod_feedback: Course reset should update dates
Stephen Bourget [Tue, 19 Jul 2016 02:08:00 +0000 (22:08 -0400)]
MDL-55157 mod_feedback: Course reset should update dates

5 years agoMDL-52544 oracle: small tweaks
Eloy Lafuente (stronk7) [Mon, 18 Jul 2016 23:48:02 +0000 (01:48 +0200)]
MDL-52544 oracle: small tweaks

This commit just:

- Moves the null => '' to better place, restricting it to PHP >= 7.0
  (bug https://bugs.php.net/bug.php?id=72524)
- Adds a couple of notes here and there.
- Changes some small details to keep the file using the same coding.

5 years agoMerge branch 'MDL-52544-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jul 2016 02:04:18 +0000 (04:04 +0200)]
Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle

5 years agoMDL-50937 jquery: Upgrade to 3.1, remove migrate plugins
Damyon Wiese [Fri, 8 Jul 2016 05:05:30 +0000 (13:05 +0800)]
MDL-50937 jquery: Upgrade to 3.1, remove migrate plugins

5 years agoMerge branch 'MDL-51410_m32v2' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jul 2016 00:31:24 +0000 (02:31 +0200)]
Merge branch 'MDL-51410_m32v2' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55207-configiplist-errors' of https://github.com/brendanheywood...
Eloy Lafuente (stronk7) [Tue, 19 Jul 2016 00:26:58 +0000 (02:26 +0200)]
Merge branch 'MDL-55207-configiplist-errors' of https://github.com/brendanheywood/moodle

5 years agoMerge branch 'wip-mdl-55111' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jul 2016 00:09:17 +0000 (02:09 +0200)]
Merge branch 'wip-mdl-55111' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 18 Jul 2016 23:48:28 +0000 (01:48 +0200)]
Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-54943-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 18 Jul 2016 23:19:13 +0000 (01:19 +0200)]
Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

5 years agoMerge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle
David Monllao [Mon, 18 Jul 2016 22:50:41 +0000 (00:50 +0200)]
Merge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle

5 years agoMDL-55158 mod_data: Add calendar events for database activities
Stephen Bourget [Mon, 18 Jul 2016 22:35:37 +0000 (18:35 -0400)]
MDL-55158 mod_data: Add calendar events for database activities

5 years agoMerge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 18 Jul 2016 18:50:47 +0000 (20:50 +0200)]
Merge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle

Conflicts:
lib/upgrade.txt

5 years agoMerge branch 'MDL-55200_master'
David Monllao [Mon, 18 Jul 2016 18:41:07 +0000 (20:41 +0200)]
Merge branch 'MDL-55200_master'

5 years agoMDL-55200 question type ddmarker: Display coordinates on image
Steffen Pegenau [Mon, 18 Jul 2016 09:42:30 +0000 (11:42 +0200)]
MDL-55200 question type ddmarker: Display coordinates on image

To make the creation of dropzones easier, the mouse coordinates are shown.

5 years agoMerge branch 'MDL-55162-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 18 Jul 2016 18:35:50 +0000 (20:35 +0200)]
Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle

Conflicts:
mod/assign/externallib.php

5 years agoMerge branch 'MDL-55161-m' of https://github.com/micaherne/moodle
David Monllao [Mon, 18 Jul 2016 18:00:18 +0000 (20:00 +0200)]
Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle

5 years agoMerge branch 'MDL-55163-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 18 Jul 2016 17:42:46 +0000 (19:42 +0200)]
Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-14448_m32v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 18 Jul 2016 14:06:22 +0000 (15:06 +0100)]
Merge branch 'MDL-14448_m32v1' of https://github.com/sbourget/moodle

5 years agoMerge branch 'wip-mdl-55174' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 18 Jul 2016 13:49:48 +0000 (14:49 +0100)]
Merge branch 'wip-mdl-55174' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-55190-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 18 Jul 2016 13:21:03 +0000 (14:21 +0100)]
Merge branch 'MDL-55190-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-55012-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 18 Jul 2016 12:55:50 +0000 (13:55 +0100)]
Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 18 Jul 2016 12:38:36 +0000 (13:38 +0100)]
Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'wip-mdl-54977' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 18 Jul 2016 12:27:48 +0000 (13:27 +0100)]
Merge branch 'wip-mdl-54977' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 18 Jul 2016 09:51:06 +0000 (10:51 +0100)]
Merge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 18 Jul 2016 08:17:53 +0000 (09:17 +0100)]
Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-55174 core_tests: Use proper itemid while creating file
Rajesh Taneja [Fri, 15 Jul 2016 06:18:43 +0000 (14:18 +0800)]
MDL-55174 core_tests: Use proper itemid while creating file

5 years agoMDL-51758 libraries: Remove password_compat library from core
Andrew Nicols [Wed, 14 Oct 2015 04:20:46 +0000 (12:20 +0800)]
MDL-51758 libraries: Remove password_compat library from core

5 years agoMDL-55173 mod_forum: Perform final deprecations
Andrew Nicols [Sun, 10 Jul 2016 23:50:56 +0000 (07:50 +0800)]
MDL-55173 mod_forum: Perform final deprecations

5 years agoMDL-54915 core: JS Blocks must not used shared variables
Andrew Nicols [Mon, 11 Jul 2016 07:46:49 +0000 (15:46 +0800)]
MDL-54915 core: JS Blocks must not used shared variables

The JS blocks in a template must _not_ use a shared variable as they can be
executed asynchronously and complete in any order.

Instead it is stored in the only local variable available - the current
context.

Since the context can be passed in from elsewhere, we namespace it to
reduce the chance of collission.

5 years agoMDL-55207 adminlib: Improve help and validation errors for configiplist
Brendan Heywood [Wed, 13 Jul 2016 04:50:53 +0000 (14:50 +1000)]
MDL-55207 adminlib: Improve help and validation errors for configiplist

5 years agoMDL-55174 core_testing: Use proper directory separator
Rajesh Taneja [Fri, 15 Jul 2016 05:51:33 +0000 (13:51 +0800)]
MDL-55174 core_testing: Use proper directory separator

While searching for existing files if directory
separator is not correct then original files
and directories will be deleted. So use DIRECTORY_SEPARATOR.

5 years agoMDL-55012 Atto: no style attrs on paste
Damyon Wiese [Sun, 26 Jun 2016 00:20:54 +0000 (17:20 -0700)]
MDL-55012 Atto: no style attrs on paste

Specifically on paste - we don't need all the random style attributes
from content on the clipboard. When you copy from a webpage - the browser
inlines all the styles from the page so that the pasted content will look
like the place it was copied from. But this is never what you want - you
want the content on paste, but with no special styling.

5 years agoMDL-55240 editpdf: Revert changes in MDL-54772
Jun Pataleta [Fri, 15 Jul 2016 02:06:51 +0000 (10:06 +0800)]
MDL-55240 editpdf: Revert changes in MDL-54772

* Revert rendering of annotations and comments back to the
  drawing region.
* Bind events to stamp annotation when editing only.

5 years agoMDL-55141 task: Add CLI debugging for tasks
Anant [Tue, 12 Jul 2016 23:32:43 +0000 (16:32 -0700)]
MDL-55141 task: Add CLI debugging for tasks

5 years agoweekly release 3.2dev
David Monllao [Thu, 14 Jul 2016 09:28:40 +0000 (11:28 +0200)]
weekly release 3.2dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 14 Jul 2016 09:28:37 +0000 (11:28 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-14448 mod_lesson: Add view permissions
Stephen Bourget [Wed, 13 Jul 2016 23:10:06 +0000 (19:10 -0400)]
MDL-14448 mod_lesson: Add view permissions

5 years agoMDL-55190 search: Limit search to non-files if disabled
Eric Merrill [Wed, 13 Jul 2016 10:05:33 +0000 (06:05 -0400)]
MDL-55190 search: Limit search to non-files if disabled

5 years agoMDL-55161 assign: Check for existence of gradebook feedback plugin
Michael Aherne [Fri, 8 Jul 2016 09:48:00 +0000 (10:48 +0100)]
MDL-55161 assign: Check for existence of gradebook feedback plugin

5 years agoMDL-55126 files: Deprecate get_records_csv and put_records_csv.
Adrian Greeve [Wed, 13 Jul 2016 05:57:59 +0000 (13:57 +0800)]
MDL-55126 files: Deprecate get_records_csv and put_records_csv.

Initial deprecation of the above functions.

5 years agoMDL-54977 blocks_navigation: Use html_writer::random_id for id
JD [Tue, 12 Jul 2016 23:45:08 +0000 (19:45 -0400)]
MDL-54977 blocks_navigation: Use html_writer::random_id for id

uniqid() may returns the same id for faster machines (seen on iis)
so use html_writer::random_id(), to ensure id is different and
navigation don't break

5 years agoMerge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle
Andrew Nicols [Wed, 13 Jul 2016 04:07:36 +0000 (12:07 +0800)]
Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle

5 years agoMDL-47371 mod_book: Fix out of scope $unescapedtitle
Cameron Ball [Wed, 13 Jul 2016 02:24:58 +0000 (10:24 +0800)]
MDL-47371 mod_book: Fix out of scope $unescapedtitle

5 years agoMDL-52544 oracle: Apply upstream pull request to AdoDB oracle driver
Damyon Wiese [Tue, 12 Jul 2016 08:44:23 +0000 (16:44 +0800)]
MDL-52544 oracle: Apply upstream pull request to AdoDB oracle driver

Upstream: https://github.com/ADOdb/ADOdb/pull/259

Prevent segfault with ocipo driver on php7.

The OCIFetchinto function is causing segfaults on php7 - probably because the fields array
is not initialised or it is optimised out. This fixes just changes to use the safer function
oci_fetch_array instead.

5 years agoMDL-51410 mod_survey: fix notifications when saving analysis
Stephen Bourget [Wed, 13 Jul 2016 00:07:35 +0000 (20:07 -0400)]
MDL-51410 mod_survey: fix notifications when saving analysis

5 years agoMerge branch 'MDL-55083_master' of https://github.com/tunele/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 22:09:08 +0000 (00:09 +0200)]
Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle

5 years agoMDL-55083 admin: provide friendly error in case phpxml is missing
tunele [Fri, 1 Jul 2016 10:43:20 +0000 (12:43 +0200)]
MDL-55083 admin: provide friendly error in case phpxml is missing

5 years agoMerge branch 'MDL-54629-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 19:01:02 +0000 (21:01 +0200)]
Merge branch 'MDL-54629-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 16:14:17 +0000 (18:14 +0200)]
Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-53803 mod_choice: fix trailing whitespace
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 16:05:32 +0000 (18:05 +0200)]
MDL-53803 mod_choice: fix trailing whitespace

5 years agoMerge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 16:03:08 +0000 (18:03 +0200)]
Merge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 15:51:36 +0000 (17:51 +0200)]
Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle

5 years agoMerge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 13:58:59 +0000 (15:58 +0200)]
Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 13:48:13 +0000 (15:48 +0200)]
Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle

5 years agoMDL-55162 mod_assign: Refactor to use new validate_assign helper
Juan Leyva [Fri, 8 Jul 2016 11:52:26 +0000 (12:52 +0100)]
MDL-55162 mod_assign: Refactor to use new validate_assign helper

5 years agoMDL-55162 mod_assign: New WS mod_assign_view_assign
Juan Leyva [Fri, 8 Jul 2016 11:51:41 +0000 (12:51 +0100)]
MDL-55162 mod_assign: New WS mod_assign_view_assign

5 years agoMerge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 12 Jul 2016 12:53:32 +0000 (14:53 +0200)]
Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle

5 years agoMDL-37250 mod_lesson: Move conditions to queries for better performance
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 11:26:46 +0000 (13:26 +0200)]
MDL-37250 mod_lesson: Move conditions to queries for better performance

While this ony seems to affect MySQL, better put the filter/conditions
on every query so the temporary view/table does not need to handle
thousands of potentially unrelated records.

5 years agoMerge branch 'wip-MDL-37250-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 10:20:53 +0000 (12:20 +0200)]
Merge branch 'wip-MDL-37250-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-55133-master' of git://github.com/damyon/moodle
David Monllao [Tue, 12 Jul 2016 11:16:27 +0000 (13:16 +0200)]
Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 12 Jul 2016 11:03:19 +0000 (13:03 +0200)]
Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 12 Jul 2016 10:20:35 +0000 (12:20 +0200)]
Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Tue, 12 Jul 2016 09:38:56 +0000 (10:38 +0100)]
Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 12 Jul 2016 09:15:57 +0000 (10:15 +0100)]
Merge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle

5 years agoMDL-52544 oracle: php7 fixes for oci driver
Damyon Wiese [Thu, 7 Jul 2016 03:26:31 +0000 (11:26 +0800)]
MDL-52544 oracle: php7 fixes for oci driver

These are our bugs actually - the oci docs are very clear that bound
params should be in-scope when oci_execute is called - and due to pass by value etc,
this was not true for our driver.

There is another bug that needed fixing - OCI barfs if null values are bound - this
can be avoided by setting them to '' which oci treats as null.

And finally - all our lob/clob/blob hacks were also binding to local "out-of-scope" vars.

5 years agoMerge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle
David Monllao [Tue, 12 Jul 2016 08:30:31 +0000 (10:30 +0200)]
Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

5 years agoMDL-54963 search: Show no results
David Monllao [Mon, 20 Jun 2016 02:57:47 +0000 (10:57 +0800)]
MDL-54963 search: Show no results

5 years agoMerge branch 'MDL-55007-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 12 Jul 2016 08:20:15 +0000 (09:20 +0100)]
Merge branch 'MDL-55007-master' of https://github.com/dthies/moodle

5 years agoMDL-55107 gradebook: Unit tests for the new setting check.
Adrian Greeve [Tue, 5 Jul 2016 03:31:05 +0000 (11:31 +0800)]
MDL-55107 gradebook: Unit tests for the new setting check.

5 years agoMDL-55107 gradebook: Improve the 57 letter boundary upgrade.
Adrian Greeve [Tue, 5 Jul 2016 03:30:27 +0000 (11:30 +0800)]
MDL-55107 gradebook: Improve the 57 letter boundary upgrade.

This fixes a setting not being checked before and also
reduces the number of false positives.

5 years agoMDL-55133 javascript: Correctly use component names in requirejs
Damyon Wiese [Wed, 6 Jul 2016 01:50:20 +0000 (09:50 +0800)]
MDL-55133 javascript: Correctly use component names in requirejs

Core subsystems must use the 'core_' prefix always.

5 years agoMDL-47371 mod_book: Don't double escape book titles
Cameron Ball [Tue, 5 Jul 2016 09:58:13 +0000 (17:58 +0800)]
MDL-47371 mod_book: Don't double escape book titles

5 years agoMDL-47371 block_navigation: Don't double escape course titles
Cameron Ball [Tue, 5 Jul 2016 09:57:55 +0000 (17:57 +0800)]
MDL-47371 block_navigation: Don't double escape course titles

5 years agoMDL-47371 weblib: Add option to disable escaping
Cameron Ball [Tue, 5 Jul 2016 09:56:58 +0000 (17:56 +0800)]
MDL-47371 weblib: Add option to disable escaping

5 years agoMerge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 12 Jul 2016 00:53:58 +0000 (02:53 +0200)]
Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-5507 filter_mathjaxloader: Add commeents for regexes
Daniel Thies [Mon, 11 Jul 2016 18:20:41 +0000 (13:20 -0500)]
MDL-5507 filter_mathjaxloader: Add commeents for regexes

5 years agoMerge branch 'MDL-54926-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 11 Jul 2016 15:54:40 +0000 (16:54 +0100)]
Merge branch 'MDL-54926-master' of git://github.com/merrill-oakland/moodle

5 years agoMDL-55048 travis: check npm/grunt on multiple npm versions
Dan Poltawski [Thu, 7 Jul 2016 09:54:30 +0000 (10:54 +0100)]
MDL-55048 travis: check npm/grunt on multiple npm versions

Check npm install and grunt execution on the higest and lowest node
versions. Included some minor tweaks along the way:

* Move the grunt execution into scripts part of the configuration (that way
  the grunt output is not collapsed and is easily visible in build output).

* Restructure the install section to be task based (thanks to Eloy for
  the suggestion) and as such, don't run composer install on the grunt
  task (speed up the build slightly).

* Switch around the grunt job to a matrix include so that every
  variation of grunt job doesn't need to be excluded.
  ( https://docs.travis-ci.com/user/customizing-the-build/#Explicity-Including-Jobs )

5 years agoMDL-55048 js: rebuilt files with new version of uglifyjs
Dan Poltawski [Thu, 7 Jul 2016 14:47:07 +0000 (15:47 +0100)]
MDL-55048 js: rebuilt files with new version of uglifyjs

5 years agoMDL-55048 grunt: make uglify task behave as before
Dan Poltawski [Tue, 28 Jun 2016 16:52:52 +0000 (17:52 +0100)]
MDL-55048 grunt: make uglify task behave as before

Don't output the status of uglifyied JS files, just the final result,
will still report what happens in detail in verbose mode

5 years agoMDL-55048 grunt/npm: Update dependencies
Dan Poltawski [Tue, 28 Jun 2016 16:45:11 +0000 (17:45 +0100)]
MDL-55048 grunt/npm: Update dependencies

* We bump our minimum node version up to >=4. Although this isn't yet
  necessarily *required* it was spurred on because grunt dropped support
  for very early node versions and so it's likely some devs will have to
  upgrade their npm.

  We do it now which gives us more flexibility for tools going forward
  (especially for things like new theme/testing). And node has matured
  the ecosystem (especially supporting properly semver) so should result
  in less edge cases.

* We make the minimum node version explicit in package.json. Though it
  doesn't help much for older versions of node because npm doesn't
  have the functionality to warn about it.. ;-)

* Left async dependency as it was, because it's only on an RC: 2.0.0-rc.6

5 years agoMerge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 11 Jul 2016 14:50:51 +0000 (16:50 +0200)]
Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 11 Jul 2016 14:20:48 +0000 (15:20 +0100)]
Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 11 Jul 2016 14:15:48 +0000 (16:15 +0200)]
Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 11 Jul 2016 13:59:44 +0000 (15:59 +0200)]
Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle
David Monllao [Mon, 11 Jul 2016 13:50:29 +0000 (15:50 +0200)]
Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 11 Jul 2016 13:42:06 +0000 (14:42 +0100)]
Merge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle

5 years agoMDL-18599 mod_forum: Hide single discussion owner's name and picture
Jun Pataleta [Fri, 1 Jul 2016 08:56:16 +0000 (16:56 +0800)]
MDL-18599 mod_forum: Hide single discussion owner's name and picture

* On the discussion's page.
* On the recent activity block.
* On the recent activity page.

5 years agoMerge branch 'MDL-55137-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 11 Jul 2016 13:37:56 +0000 (14:37 +0100)]
Merge branch 'MDL-55137-master' of git://github.com/cameron1729/moodle