Commit graph

17725 commits

Author SHA1 Message Date
David Monllao
016208776f Merge branch 'MDL-53179' of https://github.com/andrewhancox/moodle 2016-03-15 15:07:46 +08:00
David Monllao
858ad11363 MDL-48680 scorm: Marking cmielement_submitted as abstract 2016-03-15 15:01:57 +08:00
David Monllao
e022b79164 Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of https://github.com/scara/moodle 2016-03-15 14:56:50 +08:00
Andrew Nicols
295ab83d2e Merge branch 'MDL-53351-master-lti-notice' of git://github.com/mudrd8mz/moodle 2016-03-15 12:48:06 +08:00
Juan Leyva
8e76a2fadb MDL-49934 assign: Allow admins, managers to use get_assignments ws 2016-03-14 10:09:54 +01:00
Juan Leyva
2fa6c632c2 MDL-52924 mod_assign: Return editpdf subplugin file areas 2016-03-14 09:53:40 +01:00
David Monllao
c854ce6eb7 Merge branch 'MDL-53102-messageid' of https://github.com/brendanheywood/moodle 2016-03-14 14:17:41 +08:00
David Monllao
f8aaf45d30 Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle 2016-03-14 13:59:21 +08:00
Brendan Heywood
54dceeed88 MDL-53102 email: Ensure all emails generate consistent Message-ID URLs 2016-03-14 14:20:10 +11:00
Andrew Nicols
2e2e4caa7e Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle 2016-03-14 11:17:40 +08:00
Andrew Nicols
bac8a365fa Merge branch 'MDL-52821-master' of https://github.com/xow/moodle 2016-03-14 10:58:25 +08:00
Matteo Scaramuccia
f5bc19c877 MDL-48680 mod_scorm: Added new events: {scoreraw,status}_submitted.
Thanks to Ben Johnson and Josh Willcock for their contribution to this
patch.
2016-03-13 09:58:51 +01:00
Juan Leyva
96d5607cba MDL-52852 mod_quiz: New WS mod_quiz_save_attempt 2016-03-11 16:16:02 +01:00
Dani Palou
9a4c52221e MDL-51986 wiki: Add tests for mod_wiki_get_page_contents 2016-03-11 14:09:36 +01:00
Dani Palou
5d94e34322 MDL-51986 wiki: New WS mod_wiki_get_page_contents 2016-03-11 14:09:36 +01:00
Dani Palou
ed4fb2bf7e MDL-51887 wiki: Add tests for mod_wiki_get_subwiki_pages 2016-03-11 13:35:30 +01:00
Dani Palou
96abf9af07 MDL-51887 wiki: New WS mod_wiki_get_subwiki_pages 2016-03-11 13:35:30 +01:00
Juan Leyva
bc9733e710 MDL-52830 mod_quiz: New Web Service mod_quiz_get_attempt_summary 2016-03-11 11:06:50 +01:00
Juan Leyva
4c08658a23 MDL-52813 mod_quiz: Refactor and new quiz external tests 2016-03-11 11:05:15 +01:00
Juan Leyva
bc247b0dee MDL-52813 mod_quiz: New Web Service mod_quiz_get_attempt_data 2016-03-11 11:05:15 +01:00
Juan Leyva
1d57e4fea5 MDL-52813 mod_quiz: New method for getting the type of a question 2016-03-11 10:28:17 +01:00
Juan Leyva
b89544404e MDL-52788 mod_quiz: New Web Service mod_quiz_start_attempt 2016-03-11 10:22:47 +01:00
Juan Leyva
0057c2ced6 MDL-52788 mod_quiz: Move start attempt code to new API functions 2016-03-11 10:19:53 +01:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00
Rajesh Taneja
07298309dc MDL-46891 behat: Move wait in behat_base so it can be used easily 2016-03-11 10:51:16 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
Eric Merrill
f6b425e2de MDL-53354 search: Add ability to limit search doc to a user 2016-03-10 09:19:05 -05:00
David Monllao
9de085c6fc MDL-52786 quiz: Adding mod_quiz_get_combined_review_options to mobile service 2016-03-09 15:29:41 +08:00
David Monllao
da51a9be95 Merge branch 'MDL-52786-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2016-03-09 15:29:02 +08:00
David Monllao
ba8afbdb07 MDL-52785 quiz: Adding mod_quiz_get_user_best_grade to mobile service 2016-03-09 15:18:11 +08:00
David Monllao
20097a057d Merge branch 'MDL-52785-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2016-03-09 15:16:48 +08:00
David Monllao
5ca1a77649 MDL-52670 quiz: Adding function to mobile service 2016-03-09 15:12:10 +08:00
David Monllao
9b701a37e4 Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
2016-03-09 15:10:54 +08:00
Michael de Raadt
b2b4f7c485 MDL-52133 mod_assign: Pass userid param when saving grade 2016-03-09 15:20:56 +11:00
Andrew Nicols
233b677bd4 MDL-51571 lti: Whitespace fixes 2016-03-09 12:05:08 +08:00
Andrew Nicols
b80343e223 Merge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/moodle 2016-03-09 11:11:32 +08:00
David Monllao
c17e0034a1 Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle 2016-03-09 10:55:18 +08:00
Simey Lameze
85984545a9 MDL-53031 mod_assign: add session check on assignment plugins management 2016-03-08 19:46:07 +01:00
David Monllao
3f5c6ff2de Merge branch 'MDL-50218-master' of https://github.com/xow/moodle 2016-03-08 14:39:54 +08:00
Andrew Nicols
8a3d695d6c Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle 2016-03-08 09:21:47 +08:00
Cameron Ball
1688564a6e MDL-52651 htmlpurifier: Append rel=noreferrer to links.
Thank you to Zachary Durber for originally working on this issue.
2016-03-08 02:05:55 +01:00
Juan Leyva
711f9468d4 MDL-52901 mod_assign: Check due dates in external save_submission 2016-03-08 00:12:29 +01:00
David Mudrák
a5fae3b0d2 MDL-52727 mod_data: Improve output of the form fields values
This issue mostly affects the search form fields. Submitted values for
these fields are typically obtained via optional_param() with
PARAM_NOTAGS specified as the parameter type - see parse_search_field()
methods. Such values themselves are not safe enough to be printed back
directly into the HTML as they might contain malicious code.

While working on the patch, some other places with weak protection were
detected and fixed.

In case of the itemid parameters, explicit clean_param() is added to
make sure we cast the value as an integer. That should make the s()
unnecessary but it was added anyway as an extra protection (just in case
the code flow changes or the parts of the code are re-used elsewhere).
2016-03-07 22:08:46 +01:00
Juan Leyva
1f67c0b83e MDL-52786 mod_quiz: New WS mod_quiz_get_combined_review_options 2016-03-07 11:46:32 +01:00
Juan Leyva
c76425e869 MDL-52786 mod_quiz: Fix quiz_get_combined_reviewoptions 2016-03-07 11:45:01 +01:00
David Mudrák
496bf3ea16 MDL-53351 lti: Do not throw PHP notice when deleting LTI instance
The typeid=0 is a valid and common value representing "Automatic, based
on launch URL" type. In that case, no record in the lti_types table is
found. Thence attempting to access its toolproxyid property used to
throw PHP notice.
2016-03-04 16:42:05 +01:00
Juan Leyva
0ca559a111 MDL-50032 webservice: Remove plugin functions from mobile service 2016-03-04 14:15:33 +01:00
Juan Leyva
e73e458170 MDL-52785 mod_quiz: New Web Service mod_quiz_get_user_best_grade 2016-03-04 11:17:39 +01:00
Juan Leyva
c161ecff88 MDL-52670 mod_quiz: New Web Service mod_quiz_get_user_attempts 2016-03-04 09:29:32 +01:00
John Okely
e42b23ebe2 MDL-50218 lti: Return empty grade when none exists 2016-03-04 16:26:08 +08:00