moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79718 commits 37 branches 544 tags 1.3 GiB
Commit graph

79718 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Nicols
bfccdb9600 Merge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle 2016-07-04 15:11:14 +08:00
Barbara Ramiro
40be0da500 MDL-54165 mod_assign: Layout icons for the new grading interface 2016-07-04 07:00:11 +00:00
Andrew Nicols
ab698201d7 Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle 2016-07-04 14:16:54 +08:00
Andrew Nicols
91dc1e8795 Merge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle 2016-07-04 14:04:23 +08:00
Andrew Nicols
0f6f3ccc3c Merge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle 2016-07-04 12:59:09 +08:00
Andrew Nicols
2110dead4f Merge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle 2016-07-04 12:18:34 +08:00
Andrew Nicols
97e0cc8dbe Merge branch 'MDL-55050-master' of git://github.com/danpoltawski/moodle 2016-07-04 12:16:31 +08:00
Andrew Nicols
91e46852fc Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle 2016-07-04 11:52:05 +08:00
Cameron Ball
c89d23ee6d
MDL-41945 mod_assign: Properly check if submission is empty 
Previous empty submission checks required the submission to
be saved to the database. This patch adds a new method to
submission plugins that lets them report whether the submission
is empty before it is saved.
 2016-07-04 10:55:06 +08:00
Andrew Nicols
4ffe12b0f8 Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle 2016-07-04 10:54:59 +08:00
Cameron Ball
16b36d376a
MDL-41945 mod_assign: Check if submission has been modified 
This patch adds a check that stops a user submitting an assignment
if someone else has modified it in the meantime.
 2016-07-04 10:51:57 +08:00
Andrew Nicols
c3d8f27a95 Merge branch 'MDL-54968-master' of git://github.com/marinaglancy/moodle 2016-07-04 10:21:06 +08:00
Andrew Nicols
b4d0244b7c Merge branch 'MDL-53019' of git://github.com/stronk7/moodle 2016-07-04 09:07:39 +08:00
Eloy Lafuente (stronk7)
1de0b34bed Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle 2016-07-04 01:05:12 +02:00