Commit graph

22028 commits

Author SHA1 Message Date
David Monllao
3e2b1e179f Merge branch 'MDL-49599-master' of git://github.com/andrewnicols/moodle 2016-07-19 08:53:28 +02:00
Andrew Nicols
b34ed08a12 MDL-49599 core: Fully deprecate the boxclient class 2016-07-19 14:44:51 +08:00
Jun Pataleta
3046ee9f0d MDL-50051 core: Update todo tag comment for get_referer 2016-07-19 13:40:09 +08:00
Jun Pataleta
2a72354167 MDL-50051 core: Add deprecated tags to deprecated methods 2016-07-19 13:39:39 +08:00
Damyon Wiese
8d00afb12c 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.
2016-07-19 12:55:50 +08:00
Eloy Lafuente (stronk7)
5281e6a082 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.
2016-07-19 04:04:32 +02:00
Eloy Lafuente (stronk7)
74ec2dd63d Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle 2016-07-19 04:04:18 +02:00
Damyon Wiese
d863344ad7 MDL-50937 jquery: Upgrade to 3.1, remove migrate plugins 2016-07-19 09:27:40 +08:00
Rajesh Taneja
ddf36bf5aa MDL-55258 behat: Set focus on button before clicking it
Set the focus on button to ensure it is in
viewport before clicking on it.
2016-07-19 09:23:44 +08:00
Eloy Lafuente (stronk7)
f91d6783aa Merge branch 'MDL-55207-configiplist-errors' of https://github.com/brendanheywood/moodle 2016-07-19 02:26:58 +02:00
David Monllao
b3b1833097 Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2016-07-19 01:19:13 +02:00
David Monllao
c08a7eebb6 Merge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
2016-07-18 20:50:47 +02:00
Dan Poltawski
3ed88885e5 Merge branch 'wip-mdl-55174' of https://github.com/rajeshtaneja/moodle 2016-07-18 14:49:48 +01:00
Dan Poltawski
151aaa2654 Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle 2016-07-18 13:55:50 +01:00
Rajesh Taneja
ce78e33a84 MDL-55174 core_tests: Use proper itemid while creating file 2016-07-18 10:29:23 +08:00
Andrew Nicols
21e8b48d13 MDL-51758 libraries: Remove password_compat library from core 2016-07-18 10:06:57 +08:00
Andrew Nicols
9a60d5f98f 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.
2016-07-18 08:29:52 +08:00
Brendan Heywood
685e5b002c MDL-55207 adminlib: Improve help and validation errors for configiplist 2016-07-15 16:38:54 +10:00
Rajesh Taneja
fc2e137750 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.
2016-07-15 13:51:41 +08:00
Damyon Wiese
91445c63f8 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.
2016-07-15 13:34:11 +08:00
Adrian Greeve
f6f0ba2d45 MDL-55126 files: Deprecate get_records_csv and put_records_csv.
Initial deprecation of the above functions.
2016-07-13 14:22:46 +08:00
Damyon Wiese
87c6f9ab23 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.
2016-07-13 08:45:06 +08:00
Eloy Lafuente (stronk7)
af8b948e2b Merge branch 'MDL-54629-master' of git://github.com/jleyva/moodle 2016-07-12 21:01:02 +02:00
Eloy Lafuente (stronk7)
5748e56242 Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle 2016-07-12 18:14:17 +02:00
Eloy Lafuente (stronk7)
4a132893e0 Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle 2016-07-12 17:51:36 +02:00
David Monllao
7aad43e13f Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle 2016-07-12 13:16:27 +02:00
David Monllao
64c1e707a9 Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle 2016-07-12 13:03:19 +02:00
David Monllao
b60d4fca13 Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle 2016-07-12 12:20:35 +02:00
Dan Poltawski
815abdf4db Merge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle 2016-07-12 10:15:57 +01:00
Damyon Wiese
eea2fc4319 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.
2016-07-12 16:55:47 +08:00
Dan Poltawski
acb75afe39 Merge branch 'MDL-55007-master' of https://github.com/dthies/moodle 2016-07-12 09:20:15 +01:00
Adrian Greeve
97a85bf6f0 MDL-55107 gradebook: Unit tests for the new setting check. 2016-07-12 13:30:10 +08:00
Adrian Greeve
05156571c0 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.
2016-07-12 13:30:10 +08:00
Damyon Wiese
a066cfc843 MDL-55133 javascript: Correctly use component names in requirejs
Core subsystems must use the 'core_' prefix always.
2016-07-12 11:15:17 +08:00
Cameron Ball
a530cb93f5
MDL-47371 block_navigation: Don't double escape course titles 2016-07-12 10:31:17 +08:00
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