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
Eloy Lafuente (stronk7)
f71eaa794d
Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle
2016-07-12 02:53:58 +02:00
Daniel Thies
fa3f814792
MDL-5507 filter_mathjaxloader: Add commeents for regexes
2016-07-11 13:20:41 -05:00
Dan Poltawski
b76edf3cfa
Merge branch 'MDL-54926-master' of git://github.com/merrill-oakland/moodle
2016-07-11 16:54:40 +01:00
Dan Poltawski
7402479c45
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 )
2016-07-11 15:53:10 +01:00
Dan Poltawski
9b62a3eb71
MDL-55048 js: rebuilt files with new version of uglifyjs
2016-07-11 15:53:10 +01:00
Dan Poltawski
0e6e19179e
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
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
64ec975e19
Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle
2016-07-11 15:20:48 +01:00
David Monllao
26140adbb9
Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle
2016-07-11 16:15:48 +02:00
David Monllao
034544ffda
Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle
2016-07-11 15:59:44 +02:00
David Monllao
27600832aa
Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle
2016-07-11 15:50:29 +02:00
Dan Poltawski
8846f9950f
Merge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle
2016-07-11 14:42:06 +01:00
Jun Pataleta
af0fc6a254
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.
2016-07-11 21:40:19 +08: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
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
Dan Poltawski
7d650df727
Merge branch 'MDL-55128-master' of git://github.com/jleyva/moodle
2016-07-11 13:33:23 +01:00
Dan Poltawski
e9da895634
Merge branch 'wip-MDL-55154-master' of git://github.com/abgreeve/moodle
2016-07-11 13:31:24 +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
Dan Poltawski
e2f79e330d
Merge branch 'MDL-53222_master' of git://github.com/dmonllao/moodle
2016-07-11 11:42:41 +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
Juan Leyva
95624eef09
MDL-55163 mod_assign: Fix mod_assign_copy_previous_attempts
...
- Not exposed via WS
- Have a bug when calling the api function
2016-07-11 10:35:24 +01:00
David Monllao
1d17f51a8d
Merge branch 'MDL-54832-master' of https://github.com/nashtechdev01/moodle
2016-07-11 06:47:13 +02:00
Adrian Greeve
681f8f09c0
MDL-37250 mod_lesson: All actual attempts on the lesson are displayed.
...
The lesson overview report now shows all attempts made including hitting
the page and immediately navigating away.
2016-07-11 08:18:41 +08:00
AMOS bot
65ec0d7d77
Automatically generated installer lang files
2016-07-11 00:05:50 +08:00
Rajesh Taneja
d89dc6b123
MDL-55111 behat: Use option which is available everytime for export
...
recentupcoming option is always available everytime calendar export
is called, rest week and month is optionally shown and may not be
visible. So use recentupcoming event option and export calendar for test
2016-07-10 11:11:31 +08:00
Nadav Kavalerchik
3bce7d0880
MDL-55170 theme_bootstrapbase: Fix user enrollment dialog, RTL
2016-07-09 14:52:21 +03:00
Dan Poltawski
d7f2176fd8
MDL-54671 css: fix lint errors
2016-07-08 12:58:54 +01:00
Dan Poltawski
c5ec7b698b
MDL-54671 css: reformat css
2016-07-08 12:54:13 +01:00
Stephen Bourget
03064d6a89
MDL-54891 Block_activity_results: Allow admin defaults
2016-07-08 05:10:27 +00:00
Adrian Greeve
d58f3a4d2a
MDL-54962 mod_data: Approval status is now translated.
...
It was using hardcoded English. Now it uses get_string.
2016-07-08 10:53:39 +08:00
Adrian Greeve
9582e530eb
MDL-55154 mod_lesson: Lesson numerical response shows images.
2016-07-08 09:54:58 +08:00
Daniel Thies
b54aeb5f83
MDL-55007 filter_mathjaxloader: Change unit test
2016-07-07 18:59:08 -05:00
Daniel Thies
638b473808
MDL-55007 filter_mathjaxloader: Wrap nolink around each expresssion
2016-07-07 18:58:15 -05:00
Stephen Bourget
9be8052937
MDL-11369 mod_choice: Add calendar events for choice activities
2016-07-07 16:56:17 -04:00
Stephen Bourget
1725216aee
MDL-49029 mod_choice: Add view permissions
2016-07-07 15:10:17 -04:00
Dan Poltawski
d3a93557d5
MDL-55134 less: make indentation consistent
2016-07-07 14:57:14 +01: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
c905cd233d
MDL-54944 js: fix quoting of object properities coding style
...
Detected by http://eslint.org/docs/rules/quote-props
2016-07-07 12:11:05 +01:00