Commit graph

79277 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6e24e529c9 Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle 2016-07-06 03:19:08 +02:00
Rajesh Taneja
2648dddd2a MDL-55043 core_competency: Set proper sort order for each field 2016-07-06 08:12:13 +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)
006e2b787a Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle 2016-07-06 00:03:39 +02: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)
ed2d12a125 Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle 2016-07-05 21:15:31 +02:00
Eloy Lafuente (stronk7)
8a8e436cf7 Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle 2016-07-05 21:10:28 +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)
1d44e47cc4 Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle 2016-07-05 20:44:14 +02:00
Eloy Lafuente (stronk7)
4b7ac6023c Merge branch 'MDL-54867-master' of git://github.com/jleyva/moodle 2016-07-05 20:25:54 +02:00
Eloy Lafuente (stronk7)
e51f7a6a20 Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle 2016-07-05 20:16:44 +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)
6b43e964ac MDL-55000 grade: Use correct component names + minor jsdocs
Note the js_call_amd() call still is using incorrect 'grades'
as component name where it should be core_grades. That will be
fixed by MDL-55133.
2016-07-05 19:59:24 +02:00
Eloy Lafuente (stronk7)
17695e4b4d Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle 2016-07-05 19:35:56 +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
b5233f9bc9 MDL-55000 grade: Convert remaining YUI2 -> AMD 2016-07-05 20:07:46 +08: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
Eloy Lafuente (stronk7)
eb3b4893b5 Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle 2016-07-05 12:44:52 +02:00
Eloy Lafuente (stronk7)
5920c233fe Merge branch 'MDL-55113-master' of git://github.com/dpalou/moodle 2016-07-05 12:21:46 +02:00
Dan Poltawski
88dd8edf7b Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle 2016-07-05 11:20:07 +01:00
Dan Poltawski
27ade02c67 Merge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle 2016-07-05 11:06:38 +01:00
Dani Palou
6f2815fa51 MDL-54928 notifications: Add username to emailto users 2016-07-05 10:34:52 +02:00
Andrew Nicols
69efe54640 Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle 2016-07-05 15:07:21 +08:00
An Pham Van
1b0276d4bb MDL-54841 workshop: Combine links for attachment icon and text.
In a workshop activity, on the view submission page where having attachment(s), there's an accessibility issue.
There're 2 separate links for the icon and text which causes an issue for keyboard and screen reader users.
So the text and icon should be combined in one link.
2016-07-05 13:21:59 +07:00
Andrew Nicols
f0cae2e019 Merge branch 'MDL-55001-home-noredirect' of https://github.com/brendanheywood/moodle 2016-07-05 14:15:36 +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
5e47d5aee5 Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle 2016-07-05 09:41:31 +08:00
Andrew Nicols
9778aa4e9c Merge branch 'MDL-54889-master' of git://github.com/danpoltawski/moodle 2016-07-05 09:27:17 +08:00
Andrew Nicols
8efafb4625 Merge branch 'MDL-53019' of git://github.com/stronk7/moodle 2016-07-05 08:48:54 +08:00
Eloy Lafuente (stronk7)
6981a039c8 MDL-53019 travis: Don't run 5.6 mysql unit tests and minor cleanup 2016-07-05 02:35:26 +02: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
Rajesh Taneja
0908069407 MDL-50758 behat: Fixed string changes 2016-07-05 07:40:03 +08:00
Eloy Lafuente (stronk7)
68ddadc180 Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle 2016-07-05 00:19:59 +02:00
Dan Poltawski
c145e290a3 Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle 2016-07-04 15:56:00 +01:00
Dan Poltawski
7fddfd3768 Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle 2016-07-04 15:29:19 +01:00
Dan Poltawski
1f0daa292e Merge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle 2016-07-04 14:51:59 +01:00
Juan Leyva
6a1131e2c2 MDL-55019 webservice: Course summary text should not be cleaned 2016-07-04 14:51:14 +01:00
Dan Poltawski
98ebfabc13 Merge branch 'MDL-54994' of git://github.com/stronk7/moodle 2016-07-04 14:18:15 +01:00
Dan Poltawski
970fcc44e6 MDL-54980 mod_assign: bump version 2016-07-04 14:10:24 +01:00
Dan Poltawski
351e06e424 Merge branch 'MDL-54980-master' of git://github.com/jleyva/moodle 2016-07-04 14:09:43 +01:00
Dan Poltawski
a335305f46 Merge branch 'MDL-50758' of https://github.com/creator23/moodle 2016-07-04 14:08:39 +01: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
Dan Poltawski
2e6f52212f Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle 2016-07-04 12:39:35 +01:00
Marina Glancy
ed63718caa MDL-55069 core: escape special characters in email headers 2016-07-04 12:27:58 +01:00
Dan Poltawski
50d64a6efa Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle 2016-07-04 10:52:56 +01:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00