mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
79,394 Commits 36 Branches 519 Tags
Commit Graph

79394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
36a19ecc26 weekly release 3.2dev 2016-07-14 11:28:40 +02:00
David Monllao
78f5b1841f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-07-14 11:28:37 +02:00
Andrew Nicols
3142a57c69 Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle 2016-07-13 12:07:36 +08:00
Cameron Ball
48ae4707cc
MDL-47371 mod_book: Fix out of scope $unescapedtitle 2016-07-13 10:26:24 +08: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
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)
731f2989c9 MDL-53803 mod_choice: fix trailing whitespace 2016-07-12 18:05:32 +02:00
Eloy Lafuente (stronk7)
4a5bbd9cda Merge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle 2016-07-12 18:03:08 +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
Eloy Lafuente (stronk7)
bdfb19cc2a Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle 2016-07-12 15:58:59 +02:00
Eloy Lafuente (stronk7)
3c724b4218 Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle 2016-07-12 15:48:13 +02:00
David Monllao
eb4f0d9c84 Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle 2016-07-12 14:53:32 +02:00
Eloy Lafuente (stronk7)
9f4c5c542b MDL-37250 mod_lesson: Move conditions to queries for better performance 
While this ony seems to affect MySQL, better put the filter/conditions
on every query so the temporary view/table does not need to handle
thousands of potentially unrelated records.
 2016-07-12 13:31:25 +02:00
Eloy Lafuente (stronk7)
9401ee156c Merge branch 'wip-MDL-37250-master' of git://github.com/abgreeve/moodle 2016-07-12 13:21:19 +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
120f4ed7ee Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle 2016-07-12 10:38:56 +01:00
Dan Poltawski
815abdf4db Merge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle 2016-07-12 10:15:57 +01:00
David Monllao
4fcca5378b Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2016-07-12 10:30:31 +02: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
a9ebd43b27
MDL-47371 mod_book: Don't double escape book titles 2016-07-12 10:31: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
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