9de085c6fc
MDL-52786 quiz: Adding mod_quiz_get_combined_review_options to mobile service
2016-03-09 15:29:41 +08:00
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
ba8afbdb07
MDL-52785 quiz: Adding mod_quiz_get_user_best_grade to mobile service
2016-03-09 15:18:11 +08:00
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
5ca1a77649
MDL-52670 quiz: Adding function to mobile service
2016-03-09 15:12:10 +08:00
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
b2b4f7c485
MDL-52133 mod_assign: Pass userid param when saving grade
2016-03-09 15:20:56 +11:00
233b677bd4
MDL-51571 lti: Whitespace fixes
2016-03-09 12:05:08 +08:00
b80343e223
Merge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/moodle
2016-03-09 11:11:32 +08:00
c17e0034a1
Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle
2016-03-09 10:55:18 +08:00
85984545a9
MDL-53031 mod_assign: add session check on assignment plugins management
2016-03-08 19:46:07 +01:00
3f5c6ff2de
Merge branch 'MDL-50218-master' of https://github.com/xow/moodle
2016-03-08 14:39:54 +08:00
8a3d695d6c
Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle
2016-03-08 09:21:47 +08:00
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
711f9468d4
MDL-52901 mod_assign: Check due dates in external save_submission
2016-03-08 00:12:29 +01:00
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
1f67c0b83e
MDL-52786 mod_quiz: New WS mod_quiz_get_combined_review_options
2016-03-07 11:46:32 +01:00
c76425e869
MDL-52786 mod_quiz: Fix quiz_get_combined_reviewoptions
2016-03-07 11:45:01 +01:00
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
0ca559a111
MDL-50032 webservice: Remove plugin functions from mobile service
2016-03-04 14:15:33 +01:00
e73e458170
MDL-52785 mod_quiz: New Web Service mod_quiz_get_user_best_grade
2016-03-04 11:17:39 +01:00
c161ecff88
MDL-52670 mod_quiz: New Web Service mod_quiz_get_user_attempts
2016-03-04 09:29:32 +01:00
e42b23ebe2
MDL-50218 lti: Return empty grade when none exists
2016-03-04 16:26:08 +08:00
7204d77b9f
MDL-52821 lti: Include tool_consumer_instance_description in launch
2016-03-04 15:49:56 +08:00
ee6aa74081
MDL-52974 mod_assign: Include missing local library
2016-03-02 10:34:20 +01:00
5be405fa4a
MDL-53050 mod_forum: fix for base highlight
2016-03-02 17:18:51 +08:00
ce878562f3
Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle
2016-03-02 05:25:57 +01:00
e5a1f7d92a
MDL-52136 mod_forum: forum_post is templatable
2016-03-02 12:10:57 +08:00
b97356f215
MDL-52397 behat: Another behat fix, there is no student2 grade
2016-03-02 11:03:01 +08:00
121a0d12fb
Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle
2016-03-02 09:08:29 +08:00
ca0227dd18
MDL-52136 mod_forum: Correctly quote get_string vars in mustache
2016-03-02 09:00:28 +08:00
25a73245c0
Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
2016-03-01 21:23:16 +01:00
b8b7f33acd
Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
2016-03-01 14:56:58 +08:00
37f39924b5
Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle
2016-03-01 14:35:54 +08:00
9557a603e6
Merge branch 'MDL-52397_fix-oracle' of git://github.com/dmonllao/moodle
2016-03-01 14:35:50 +08:00
2a03c5fe06
MDL-52397 mod_assign: Fix behat test
2016-03-01 14:29:27 +08:00
21d43c12b9
MDL-50546 mod_quiz: Correct typos in WS docs
2016-03-01 14:22:06 +08:00
614173c7dc
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
2016-03-01 13:41:35 +08:00
989a84577e
MDL-52489 mod_assign: mentioned changes in upgrade.txt
2016-03-01 13:19:02 +08:00
6a9b3c5a48
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle
2016-03-01 13:10:57 +08:00
340d35a902
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
2016-03-01 13:03:06 +08:00
71ea84048d
Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle
2016-03-01 12:53:10 +08:00
b23f27fdd2
Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
2016-03-01 12:30:56 +08:00
4edd8e773d
MDL-52397 editpdf: Fix draft vs nondraft comparison
...
We can not rely on the db engine returning results in the same order
if no order is specified in get_comments and get_annotations.
Also fixing a related unit test.
2016-03-01 12:29:13 +08:00
23b6636997
MDL-51687 mod_folder: Trigger event when downloading all files.
2016-03-01 12:27:55 +08:00
fd8e293030
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
2016-03-01 12:23:54 +08:00
17f53b45ab
MDL-44952 mod_feedback: set value for hidenoselect if disabled
2016-03-01 12:21:00 +08:00
64d6465650
MDL-52974 mod_assign: Improve tests for view_submission_status
...
External tests only
2016-03-01 11:50:11 +08:00
05b0f579ca
Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle
2016-03-01 11:48:16 +08:00
d76acc87f7
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
2016-03-01 10:43:12 +08:00
David Monllao