Commit graph

79580 commits

Author SHA1 Message Date
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
Loc Nguyen
e9bf00fb14 MDL-54832 workshop: adding landmark for userplantable
Accessibility enhance: add an aria-label on the userplan table so
that it's accessible to me through my screen reader
2016-07-05 20:37:56 +07: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
Juan Leyva
8908432fab MDL-55128 course: Fix param type for shortname 2016-07-05 09:50:32 +01:00
Dani Palou
6f2815fa51 MDL-54928 notifications: Add username to emailto users 2016-07-05 10:34:52 +02:00
Juan Leyva
7c4e686f94 MDL-54943 webservice: New WS core_course_get_activities_overview 2016-07-05 09:10:13 +01:00
Juan Leyva
6e7bf3963b MDL-54869 webservice: Fix core_user_add_user_private_files 2016-07-05 09:01:35 +01:00
Juan Leyva
460897052e MDL-54869 files: Create new required functions
This was a complex change requiring three new functions:
file_merge_files_from_draft_area_into_filearea - To just add files from a draft area into a real one (just adding or updating, not deleting)
file_merge_draft_area_into_draft_area - To merge files from two draft areas, used by the latest for creating a draft area with all the original files plus the new ones.
file_overwrite_existing_draftfile - Required to update existing files not losing metadata or references.

The whole process is the following:

    User uploads a file (upload.php)
    Client gets a new draftid A containing the file only (return of upload.php)
    Client requests to merge that draftid in the user's private files (core_user_add_user_private_files)
    Server prepares a new UNUSED draftid B from existing area
    Server merges A into B
    Server saves the draft B into the final area
2016-07-05 09:01:34 +01:00
Juan Leyva
d089e4984d MDL-54869 files: Fix file_save_draft_area_files documentation 2016-07-05 08:40:06 +01: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
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
Juan Leyva
ae584b3b5e MDL-54951 webservice: Utility methods for generating a list of files
It includes a new external_files structure and a get_area_files method
in external_util
2016-07-04 09:24:27 +01:00
Dani Palou
5609da91fa MDL-55113 assign: Use PARAM_RAW in onlinetext text 2016-07-04 09:53:36 +02:00
Andrew Nicols
e1ca4da750 MDL-55114 chat: Remove commented-out variables 2016-07-04 15:29:04 +08:00
Jun Pataleta
ca7e2fc21f MDL-55112 mod_forum: Query all forum fields to avoid debug messages 2016-07-04 15:22:56 +08:00