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
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
Dan Poltawski [Wed, 29 Jun 2016 15:31:31 +0000 (16:31 +0100)]
MDL-54944 eslint: make the .eslintrc default stricter
Instead of using the more rollup-tolerant config for all files, make the
configuration stricter by default but lower in grunt for yui modules.
This means that manual runs (prechecker) or editor integrations will
flag up the errors as well as grunt.
Also add ignore lines to the core files so that eslint isn't noisy when
not running with grunt.
Dan Poltawski [Wed, 29 Jun 2016 14:42:36 +0000 (15:42 +0100)]
MDL-54944 js: built files after changes
Dan Poltawski [Wed, 29 Jun 2016 14:11:37 +0000 (15:11 +0100)]
MDL-54944 js: ensure functions are consistent in return val
Mostly we are being incosnistent when giving an early-exit shortcut.
Detected by http://eslint.org/docs/rules/consistent-return
Dan Poltawski [Wed, 29 Jun 2016 13:51:07 +0000 (14:51 +0100)]
MDL-54944 js: split variable intialisations in multiple lines
To increase code clarity, we don't allow multiple intilisations to be
confused with each other.
Detected by http://eslint.org/docs/rules/one-var-declaration-per-line
Dan Poltawski [Tue, 28 Jun 2016 21:40:29 +0000 (22:40 +0100)]
MDL-54944 js: remove uncessary .call() uses
Detected by http://eslint.org/docs/rules/no-useless-call
Dan Poltawski [Tue, 28 Jun 2016 21:34:44 +0000 (22:34 +0100)]
MDL-54944 js: Remove uncessary bind() calls
Most of these cases, we are already capturing this in a temporary
variable, so the bind becomes uncessary.
Discovered by http://eslint.org/docs/rules/no-extra-bind
Dan Poltawski [Tue, 28 Jun 2016 21:21:18 +0000 (22:21 +0100)]
MDL-54944 js: fix quoting of object properities coding style
Detected by http://eslint.org/docs/rules/quote-props
Dan Poltawski [Tue, 28 Jun 2016 21:07:25 +0000 (22:07 +0100)]
MDL-54944 js: Fix spacing of objects coding style
Fixed by http://eslint.org/docs/rules/object-curly-spacing
Dan Poltawski [Tue, 28 Jun 2016 20:03:27 +0000 (21:03 +0100)]
MDL-54944 eslint: Add rules from Policy decision
Also bump eslint to v2.13.1 and make the version explicit in
package.json
Eloy Lafuente (stronk7) [Thu, 7 Jul 2016 08:19:49 +0000 (10:19 +0200)]
weekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 7 Jul 2016 08:19:45 +0000 (10:19 +0200)]
NOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Thu, 7 Jul 2016 08:19:44 +0000 (10:19 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 7 Jul 2016 03:27:58 +0000 (11:27 +0800)]
Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 6 Jul 2016 07:11:15 +0000 (15:11 +0800)]
MDL-55043 core_competency: Sort by id to ensure we get expected result.
Andrew Nicols [Thu, 7 Jul 2016 02:30:17 +0000 (10:30 +0800)]
Merge branch 'MDL-54869-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2016 11:50:12 +0000 (13:50 +0200)]
Merge branch 'wip-MDL-46682-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2016 09:30:40 +0000 (11:30 +0200)]
MDL-54934 workshop: ensure "Current phase" is always separated
Apparently some readers can join 2 adjacent spans completely, simply
adding a whitespace between them prevents that, ensuring separation.,
Cameron Ball [Wed, 6 Jul 2016 08:59:18 +0000 (16:59 +0800)]
MDL-41945 mod_assign: Add empty submission check
Adrian Greeve [Wed, 6 Jul 2016 01:48:37 +0000 (09:48 +0800)]
MDL-46682 auth/db: Increase of chunk size and update change.
The update query was not checking the mnet auth id and could
have been updating the wrong entry.
Andrew Nicols [Wed, 6 Jul 2016 07:01:06 +0000 (15:01 +0800)]
Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle
Andrew Nicols [Wed, 6 Jul 2016 05:29:18 +0000 (13:29 +0800)]
Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
Simey Lameze [Wed, 8 Jun 2016 02:18:45 +0000 (10:18 +0800)]
MDL-54734 core_user: do not cache dummy user records
Russell Smith [Wed, 6 Jul 2016 04:42:59 +0000 (14:42 +1000)]
MDL-53495 database xmldb: Ensure field tests use constant.
Some tests were still using hard coded values which break
if the constants are changed.
Andrew Nicols [Wed, 6 Jul 2016 04:01:51 +0000 (12:01 +0800)]
Merge branch 'MDL-54165-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Wed, 6 Jul 2016 03:42:25 +0000 (03:42 +0000)]
MDL-54165 mod_assign: Fix doc in grading_events.js
Rajesh Taneja [Wed, 6 Jul 2016 03:17:41 +0000 (11:17 +0800)]
MDL-54844 mod_glossary: Don't append AND as it's done later
Andrew Nicols [Wed, 6 Jul 2016 03:04:40 +0000 (11:04 +0800)]
Merge branch 'MDL-54165-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Fri, 20 May 2016 08:15:20 +0000 (08:15 +0000)]
MDL-54165 mod_assign: Collapsible review and grade panel
Andrew Nicols [Thu, 26 May 2016 05:57:31 +0000 (13:57 +0800)]
MDL-54734 user: Add tests to demonstrate multi-user issues
Adrian Greeve [Thu, 9 Jun 2016 05:58:59 +0000 (13:58 +0800)]
MDL-54844 mod_glossary: Limiting of glossary searching.
Searching of the glossary was returning results from all
glossaries on the site. It has now been returned to just
the glossary that you are currently viewing.
Eloy Lafuente (stronk7) [Wed, 6 Jul 2016 01:19:08 +0000 (03:19 +0200)]
Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle
Jerome Mouneyrac [Tue, 5 Aug 2014 10:30:29 +0000 (18:30 +0800)]
MDL-46682 auth/db: IN clause crashes when too many users to sync
Rajesh Taneja [Mon, 4 Jul 2016 05:01:17 +0000 (13:01 +0800)]
MDL-55043 core_competency: Set proper sort order for each field
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)]
Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 29 Jun 2016 05:34:11 +0000 (13:34 +0800)]
MDL-54860 behat: Stop execution if setup problem found
Andrew Nicols [Tue, 5 Jul 2016 23:21:32 +0000 (07:21 +0800)]
MDL-54951 webservice: Add upgrade notes for external_files
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 22:03:39 +0000 (00:03 +0200)]
Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:18:41 +0000 (21:18 +0200)]
Merge branch 'MDL-54856-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:15:31 +0000 (21:15 +0200)]
Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)]
Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:59:52 +0000 (20:59 +0200)]
Merge branch 'MDL-54602-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:44:14 +0000 (20:44 +0200)]
Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:25:54 +0000 (20:25 +0200)]
Merge branch 'MDL-54867-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:16:44 +0000 (20:16 +0200)]
Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)]
Merge branch 'MDL-54795_master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 17:59:24 +0000 (19:59 +0200)]
MDL-55000 grade: Use correct component names + minor jsdocs
Note the js_call_amd() call still is using incorrect 'grades'
as component name where it should be core_grades. That will be
fixed by MDL-55133.
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)]
Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 23 Jun 2016 05:04:17 +0000 (13:04 +0800)]
MDL-55000 grade: Convert remaining YUI2 -> AMD
Andrew Nicols [Mon, 4 Jul 2016 07:25:28 +0000 (15:25 +0800)]
MDL-29738 file: Remove unused stylesheet functionality
This functionality was commented out in
78946b9bdb1299a21f00b88d81c73ad8700c951e for MDL-20204 back in 2009.
Since then it has been wasting cycles performing utterly pointless
preg_match and preg_replace calls.
The decision has been made to deprecate it in stables, and remove it in
3.2.
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)]
Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 10:21:46 +0000 (12:21 +0200)]
Merge branch 'MDL-55113-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)]
Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 5 Jul 2016 10:06:38 +0000 (11:06 +0100)]
Merge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle
Dani Palou [Tue, 5 Jul 2016 08:34:52 +0000 (10:34 +0200)]
MDL-54928 notifications: Add username to emailto users
Juan Leyva [Wed, 29 Jun 2016 15:41:25 +0000 (16:41 +0100)]
MDL-54869 webservice: Fix core_user_add_user_private_files
Juan Leyva [Wed, 15 Jun 2016 07:50:07 +0000 (08:50 +0100)]
MDL-54869 files: Create new required functions
This was a complex change requiring three new functions:
file_merge_files_from_draft_area_into_filearea - To just add files from a draft area into a real one (just adding or updating, not deleting)
file_merge_draft_area_into_draft_area - To merge files from two draft areas, used by the latest for creating a draft area with all the original files plus the new ones.
file_overwrite_existing_draftfile - Required to update existing files not losing metadata or references.
The whole process is the following:
User uploads a file (upload.php)
Client gets a new draftid A containing the file only (return of upload.php)
Client requests to merge that draftid in the user's private files (core_user_add_user_private_files)
Server prepares a new UNUSED draftid B from existing area
Server merges A into B
Server saves the draft B into the final area
Juan Leyva [Tue, 14 Jun 2016 14:10:59 +0000 (15:10 +0100)]
MDL-54869 files: Fix file_save_draft_area_files documentation
Andrew Nicols [Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)]
Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
An Pham Van [Tue, 21 Jun 2016 09:49:14 +0000 (16:49 +0700)]
MDL-54841 workshop: Combine links for attachment icon and text.
In a workshop activity, on the view submission page where having attachment(s), there's an accessibility issue.
There're 2 separate links for the icon and text which causes an issue for keyboard and screen reader users.
So the text and icon should be combined in one link.
Andrew Nicols [Tue, 5 Jul 2016 06:15:36 +0000 (14:15 +0800)]
Merge branch 'MDL-55001-home-noredirect' of https://github.com/brendanheywood/moodle
Jake Dallimore [Wed, 25 May 2016 06:50:29 +0000 (14:50 +0800)]
MDL-53431 tool_monitor: Access control for tool monitor subscriptions
Andrew Nicols [Tue, 5 Jul 2016 01:41:31 +0000 (09:41 +0800)]
Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 5 Jul 2016 01:27:17 +0000 (09:27 +0800)]
Merge branch 'MDL-54889-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 5 Jul 2016 00:48:54 +0000 (08:48 +0800)]
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 00:35:26 +0000 (02:35 +0200)]
MDL-53019 travis: Don't run 5.6 mysql unit tests and minor cleanup
Andrew Nicols [Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)]
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jul 2016 23:50:43 +0000 (01:50 +0200)]
MDL-53019 php: bump all harcoded versions to new 5.6.5 requirement
Moodle 3.2 and up will require PHP >= 5.6.5. Hopefully some day we'll
have this centralized with MDL-39007, just it's not done yet.
Thanks to Stephen Bourget for raising this!
Rajesh Taneja [Mon, 4 Jul 2016 23:38:54 +0000 (07:38 +0800)]
MDL-50758 behat: Fixed string changes
Eloy Lafuente (stronk7) [Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)]
Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)]
Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)]
Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:51:59 +0000 (14:51 +0100)]
Merge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle
Juan Leyva [Fri, 24 Jun 2016 12:33:42 +0000 (13:33 +0100)]
MDL-55019 webservice: Course summary text should not be cleaned
Dan Poltawski [Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)]
Merge branch 'MDL-54994' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:10:24 +0000 (14:10 +0100)]
MDL-54980 mod_assign: bump version
Dan Poltawski [Mon, 4 Jul 2016 13:09:43 +0000 (14:09 +0100)]
Merge branch 'MDL-54980-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:08:39 +0000 (14:08 +0100)]
Merge branch 'MDL-50758' of https://github.com/creator23/moodle
Dan Poltawski [Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)]
Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)]
Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle
Dan Poltawski [Mon, 4 Jul 2016 11:39:35 +0000 (12:39 +0100)]
Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle
Marina Glancy [Mon, 4 Jul 2016 02:32:20 +0000 (10:32 +0800)]
MDL-55069 core: escape special characters in email headers
Dan Poltawski [Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)]
Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle
Juan Leyva [Tue, 21 Jun 2016 09:53:45 +0000 (10:53 +0100)]
MDL-54951 webservice: Return intro text files in modules
Juan Leyva [Tue, 21 Jun 2016 08:30:55 +0000 (09:30 +0100)]
MDL-54951 webservice: Utility methods for generating a list of files
It includes a new external_files structure and a get_area_files method
in external_util
Dani Palou [Mon, 4 Jul 2016 07:29:29 +0000 (09:29 +0200)]
MDL-55113 assign: Use PARAM_RAW in onlinetext text
Andrew Nicols [Mon, 4 Jul 2016 07:19:48 +0000 (15:19 +0800)]
MDL-55114 chat: Remove commented-out variables
Andrew Nicols [Mon, 4 Jul 2016 07:11:14 +0000 (15:11 +0800)]
Merge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle
Barbara Ramiro [Mon, 4 Jul 2016 03:58:21 +0000 (11:58 +0800)]
MDL-54165 mod_assign: Layout icons for the new grading interface
Andrew Nicols [Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)]
Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 4 Jul 2016 06:04:23 +0000 (14:04 +0800)]
Merge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:59:09 +0000 (12:59 +0800)]
Merge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:18:34 +0000 (12:18 +0800)]
Merge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:16:31 +0000 (12:16 +0800)]
Merge branch 'MDL-55050-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Mon, 4 Jul 2016 03:52:05 +0000 (11:52 +0800)]
Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle
Cameron Ball [Tue, 31 May 2016 06:20:03 +0000 (14:20 +0800)]
MDL-41945 mod_assign: Properly check if submission is empty
Previous empty submission checks required the submission to
be saved to the database. This patch adds a new method to
submission plugins that lets them report whether the submission
is empty before it is saved.
Andrew Nicols [Mon, 4 Jul 2016 02:54:59 +0000 (10:54 +0800)]
Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle
Cameron Ball [Tue, 31 May 2016 05:42:31 +0000 (13:42 +0800)]
MDL-41945 mod_assign: Check if submission has been modified
This patch adds a check that stops a user submitting an assignment
if someone else has modified it in the meantime.