Eloy Lafuente (stronk7)
ddf1d5c692
Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle
2016-07-27 00:19:40 +02:00
David Monllao
837cec00f9
Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/upgrade.txt
2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
...
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
David Monllao
854695ee3f
Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle
2016-07-26 02:40:35 +08:00
Dan Poltawski
3a0bc0fdc4
MDL-55244 js: build changes
...
There should be no changes to minified code
2016-07-25 07:58:05 +01:00
Dan Poltawski
5bb4f444de
MDL-55244 js: fix problems with eslint --fix
...
eslint --fix '**/yui/src/**/*.js'
2016-07-25 07:53:05 +01:00
David Monllao
379ca98642
MDL-55287 search: Check that an engine has been selected
2016-07-21 18:40:29 +02:00
Dan Poltawski
29dcec6803
Merge branch 'MDL-55206-master' of git://github.com/junpataleta/moodle
2016-07-19 10:52:13 +01:00
Jun Pataleta
49ccaee5a9
MDL-55206 admin: Some code cleanup
...
* Removed unnecessary TODOs.
* Changed message prompt case to sentence case.
2016-07-15 14:44:35 +08:00
Jun Pataleta
36b88f2486
MDL-55206 admin: Remove div tags in password policy error message
2016-07-15 14:40:54 +08:00
Anant
e370e069a7
MDL-55141 task: Add CLI debugging for tasks
2016-07-14 09:24:52 -07:00
Eloy Lafuente (stronk7)
5968add63f
Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle
2016-07-13 00:09:08 +02:00
tunele
f029401b36
MDL-55083 admin: provide friendly error in case phpxml is missing
2016-07-12 23:35:15 +02:00
David Monllao
eb4f0d9c84
Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle
2016-07-12 14:53:32 +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
9b62a3eb71
MDL-55048 js: rebuilt files with new version of uglifyjs
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
David Monllao
c68010eaee
MDL-55048 cli: Add example using new cool options
...
Also added short option for ignore password policy.
2016-07-11 15:17:57 +02:00
David Monllao
34127afdb6
Merge branch 'MDL-55084' of git://github.com/prg3/moodle
2016-07-11 15:06:38 +02: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
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
2d2b6c9d22
MDL-54944 js: remove uncessary .call() uses
...
Detected by http://eslint.org/docs/rules/no-useless-call
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
Cameron Ball
aa60ab01c3
MDL-54771 tool_recyclebin: Don't add temp course to recycle bin
2016-07-06 23:18:36 +08:00
Paul Greidanus
c248c3f07f
MDL-55084 admin: CLI driven password reset
...
This patch allows for changing a user's password via the command line.
This allows for scripted password changes easily.
2016-07-06 07:00:57 -06:00
Eloy Lafuente (stronk7)
006e2b787a
Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle
2016-07-06 00:03:39 +02: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
275480a0de
MDL-51242 messageinbound: Guess the port from hostspec
...
Existing language strings for the host component suggest that the host can
be provided in the format hostname:port, but we previously did not support
this.
This patch explodes the string based on the colon character and assumes
that if there are two parts, that they are in the format hostname:port.
Note: This does not attempt to deal with full host specifications (e.g.
protocol://hostname:port), as this is beyond the scope of this change.
2016-07-05 14:52:53 +08:00
Jake Dallimore
ea106d2a1d
MDL-53431 tool_monitor: Access control for tool monitor subscriptions
2016-07-05 10:36:27 +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
6e57e78652
Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle
2016-07-04 13:28:48 +01:00
Dan Poltawski
0cf471fbdd
Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle
2016-07-04 12:45:55 +01:00
Mark Johnson
4d9036d6eb
MDL-55041 roles: Fix JSON parsing in permission manager
2016-07-01 14:54:01 +01:00
Eloy Lafuente (stronk7)
59f22d4b19
MDL-53019 environment: 3.2 requirements added
...
Changes:
- PHP 5.6.5 required
2016-07-01 13:44:36 +02:00
Marina Glancy
799e001c15
MDL-55032 tool_lp: check access when showing link to competencies
...
Also if course competencies page is accessed without capabilities do
redirect before starting output.
2016-07-01 13:42:27 +08:00
Andrew Nicols
e683c0837c
Merge branch 'MDL-54964-master' of git://github.com/jleyva/moodle
2016-06-29 15:05:15 +08:00
Andrew Nicols
f9cabe8f99
Merge branch 'wip-mdl-54974' of https://github.com/rajeshtaneja/moodle
2016-06-29 15:05:13 +08:00
Eloy Lafuente (stronk7)
d4ca1215bb
Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle
2016-06-27 20:38:18 +02:00
Juan Leyva
64d2ac2145
MDL-54964 tool_mobile: Fix tests to make it work with non-core plugins
2016-06-27 09:45:23 +01:00
Rajesh Taneja
e5f2478b9f
MDL-54974 behat: Handle interupts on PHP7
...
As https://bugs.php.net/bug.php?id=71448 is
not going to get fixed, we need to declare tick
2016-06-27 14:30:58 +08:00
Andrew Nicols
04b189a875
Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle
2016-06-27 12:53:35 +08:00
Eloy Lafuente (stronk7)
e822312af3
Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle
2016-06-21 20:00:36 +02:00
Andrew Nicols
ad6b958997
Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle
2016-06-21 11:26:42 +08:00
Andrew Nicols
8a46580603
Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle
2016-06-21 10:30:22 +08:00