Commit graph

22043 commits

Author SHA1 Message Date
Cameron Ball
6fb1a7177f
MDL-47371 weblib: Add option to disable escaping 2016-07-12 10:31:17 +08:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
Dan Poltawski
2ce9109088 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
2016-07-11 15:53:10 +01:00
Eloy Lafuente (stronk7)
cf7dc57a91 Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle 2016-07-11 16:50:51 +02:00
Dan Poltawski
83ecbbc0b1 Merge branch 'MDL-55137-master' of git://github.com/cameron1729/moodle 2016-07-11 14:37:56 +01:00
David Monllao
728faf96c4 Merge branch 'MDL-51373-master' of git://github.com/jleyva/moodle 2016-07-11 13:58:34 +02:00
Dan Poltawski
ad3f8cd18c 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.
2016-07-11 12:44:34 +01:00
Juan Leyva
aa7e371af6 MDL-51373 grade: Deprecate WS core_grade_get_grades 2016-07-11 12:41:49 +01:00
David Monllao
6a4c2146f9 MDL-53222 search: Replace report_search by new searchareas admin page 2016-07-11 11:49:14 +02:00
Dan Poltawski
c3a95c2840 MDL-53222 admin: rejig listing of search areas 2016-07-11 11:38:41 +02:00
David Monllao
e704bcc776 MDL-53222 report_search: Delete from core 2016-07-11 11:38:41 +02:00
Dan Poltawski
d7f2176fd8 MDL-54671 css: fix lint errors 2016-07-08 12:58:54 +01:00
Daniel Thies
b54aeb5f83 MDL-55007 filter_mathjaxloader: Change unit test 2016-07-07 18:59:08 -05:00
Dan Poltawski
6e304922fb MDL-54944 js: built files after changes 2016-07-07 12:11:07 +01:00
Dan Poltawski
5602dc1735 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
2016-07-07 12:11:07 +01:00
Dan Poltawski
7b7d55e11a 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
2016-07-07 12:11:06 +01:00
Dan Poltawski
b1c4d0f2d7 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
2016-07-07 12:11:06 +01:00
Dan Poltawski
9f5f3dcc83 MDL-54944 js: Fix spacing of objects coding style
Fixed by http://eslint.org/docs/rules/object-curly-spacing
2016-07-07 12:11:05 +01:00
Dan Poltawski
037de71996 MDL-54944 eslint: Add rules from Policy decision
Also bump eslint to v2.13.1 and make the version explicit in
package.json
2016-07-07 12:10:49 +01:00
Andrew Nicols
71f81adce9 Merge branch 'MDL-54869-master' of git://github.com/jleyva/moodle 2016-07-07 10:30:17 +08:00
Cameron Ball
977804ed9d MDL-55137: Update PHPDoc for external_format_text 2016-07-06 17:48:07 +08:00
Andrew Nicols
9ce2448091 Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle 2016-07-06 15:01:06 +08:00
Andrew Nicols
de374c3df1 Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle 2016-07-06 13:29:18 +08:00
Simey Lameze
ec90722870 MDL-54734 core_user: do not cache dummy user records 2016-07-06 13:07:03 +08:00
Russell Smith
848d212e7a MDL-53495 database xmldb: Ensure field tests use constant.
Some tests were still using hard coded values which break
if the constants are changed.
2016-07-06 14:45:00 +10:00
Andrew Nicols
aa03ced86c MDL-54734 user: Add tests to demonstrate multi-user issues 2016-07-06 09:27:44 +08:00
Eloy Lafuente (stronk7)
a339f0dde0 Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle 2016-07-06 01:42:34 +02:00
Rajesh Taneja
25fbce21e7 MDL-54860 behat: Stop execution if setup problem found 2016-07-06 07:27:41 +08:00
Andrew Nicols
6f9ad7e2db MDL-54951 webservice: Add upgrade notes for external_files 2016-07-06 07:23:32 +08:00
Eloy Lafuente (stronk7)
f5be4e3d91 Merge branch 'MDL-54856-master' of git://github.com/jleyva/moodle 2016-07-05 21:18:41 +02:00
Eloy Lafuente (stronk7)
6880e350d3 Merge branch 'MDL-54602-master' of git://github.com/jleyva/moodle 2016-07-05 20:59:52 +02:00
Eloy Lafuente (stronk7)
efb2517a2f Merge branch 'MDL-54795_master' of https://github.com/snake/moodle 2016-07-05 20:10:33 +02:00
Eloy Lafuente (stronk7)
46da6e14ec Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle 2016-07-05 17:05:28 +02:00
Andrew Nicols
ff3778bf97 MDL-29738 file: Remove unused stylesheet functionality
This functionality was commented out in
78946b9bdb 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.
2016-07-05 19:31:22 +08:00
Juan Leyva
7c4e686f94 MDL-54943 webservice: New WS core_course_get_activities_overview 2016-07-05 09:10:13 +01:00
Juan Leyva
460897052e 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
2016-07-05 09:01:34 +01:00
Juan Leyva
d089e4984d MDL-54869 files: Fix file_save_draft_area_files documentation 2016-07-05 08:40:06 +01:00
Andrew Nicols
69efe54640 Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle 2016-07-05 15:07:21 +08:00
Andrew Nicols
5e47d5aee5 Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle 2016-07-05 09:41:31 +08:00
Andrew Nicols
642a1d5480 Merge branch 'MDL-53019' of git://github.com/stronk7/moodle 2016-07-05 08:15:02 +08:00
Eloy Lafuente (stronk7)
ae96cf6246 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!
2016-07-05 01:50:43 +02:00
Dan Poltawski
98ebfabc13 Merge branch 'MDL-54994' of git://github.com/stronk7/moodle 2016-07-04 14:18:15 +01:00
Dan Poltawski
0cf471fbdd Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle 2016-07-04 12:45:55 +01:00
Marina Glancy
ed63718caa MDL-55069 core: escape special characters in email headers 2016-07-04 12:27:58 +01:00
Juan Leyva
ae584b3b5e 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
2016-07-04 09:24:27 +01:00
Andrew Nicols
4ffe12b0f8 Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle 2016-07-04 10:54:59 +08:00
Eloy Lafuente (stronk7)
1de0b34bed Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle 2016-07-04 01:05:12 +02:00
Mark Johnson
4d9036d6eb MDL-55041 roles: Fix JSON parsing in permission manager 2016-07-01 14:54:01 +01:00
Eloy Lafuente (stronk7)
a763bb0553 MDL-54994 badges: Count correctly the number of external badges shown 2016-07-01 13:40:47 +02:00
Jake Dallimore
9e12b0faf7 MDL-54795 mod_assign: Fix notifications JS error in grading interface 2016-07-01 13:49:02 +08:00