Commit graph

77406 commits

Author SHA1 Message Date
David Monllao
9eede5bb9a Merge branch 'MDL-53350' of git://github.com/timhunt/moodle 2016-03-08 09:04:01 +08:00
David Monllao
28a6a36d9d Merge branch 'MDL-53353' of git://github.com/timhunt/moodle 2016-03-08 08:44:28 +08:00
Andrew Nicols
889b92c1c0 Merge branch 'MDL-53291_ajax_fix' of https://github.com/BenKelada/moodle 2016-03-08 07:43:31 +08:00
Krista Koivisto
7b9fbb1cf4 MDL-52774 ajax: Require authentication when getting nav branch
When getting the navigation branch data through AJAX, require
login if forcelogin is set.
2016-03-08 00:39:45 +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 Monllao
ae66ed23b6 MDL-52378 singleview: Using is_disabled instead of is_locked 2016-03-07 23:04:52 +01:00
Travis Noll
43cd0e3c9b MDL-52378 Singleview: Exclude Grade Attribute Permissions
Singleview users must have Manage Grade permission to modify the
Exclude grade attribute.
2016-03-07 23:04:42 +01:00
Juan Leyva
39b8513763 MDL-52808 calendar: Do not return events for hidden activities 2016-03-07 22:36:31 +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
Tim Hunt
981743b3ba MDL-53369 qtype_ddwtos: prevent boxes on consecutive lines touching 2016-03-07 15:22:54 +00: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
Eric Merrill
075fa91271 MDL-53325 search: Remove commit from engine interface
Remove commit from engine, and instead notify when indexes
start and stop, allowing them to decide what to do.
2016-03-06 13:46:54 -05:00
Eric Merrill
bf2235bb11 MDL-53325 search: Optimize Solr less often 2016-03-06 13:46:54 -05:00
Eric Merrill
08c21a1beb MDL-53273 search: Use unicode safe string truncation 2016-03-06 13:32:59 -05:00
dg711
df8674d26e MDL-41648 grade: Remove 'error' parameter in grading notification divs 2016-03-06 09:16:57 +05:30
Tim Hunt
4b8a86503d MDL-53353 drag-drop marker quetions: fix edit form jitter 2016-03-04 17:41:54 +00:00
Tim Hunt
286d28b5e5 MDL-53350 drag-drop to text: layout problem on reivew 2016-03-04 17:01:31 +00: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
Tim Hunt
81e47a35e8 MDL-53304 question behaviour: don't show useless Check buttons
Previously, the Check button was often shown disabled when it
could not be used (e.g. when the question was finished, or when an
interactive question was in the try-again state). Eventually we
realised it was better usability to hide it in these cases.

Note that when a teacher reviews an in-progress quiz attempt, they will
see a disabled Check button if the student doing the quiz can see the
button.
2016-03-04 14:06:19 +00:00
Juan Leyva
0ca559a111 MDL-50032 webservice: Remove plugin functions from mobile service 2016-03-04 14:15:33 +01:00
Juan Leyva
186eba1b2e MDL-50032 webservice: Allow plugins to add functions into services 2016-03-04 13:39:53 +01:00
Brendan Heywood
e1d6edb3b4 MDL-53047 login: Fixed #anchor being lost after login process 2016-03-04 22:54:11 +11: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
John Okely
7204d77b9f MDL-52821 lti: Include tool_consumer_instance_description in launch 2016-03-04 15:49:56 +08:00
Dan Poltawski
7adc7ef14f weekly release 3.1dev 2016-03-04 10:34:21 +08:00
Dan Poltawski
e754b66aa0 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-03-04 10:34:18 +08:00
AMOS bot
724dc80cf2 Automatically generated installer lang files 2016-03-03 22:23:58 +08:00
AMOS bot
a69ce40011 Automatically generated installer lang files 2016-03-03 22:23:58 +08:00
Dan Poltawski
0296f08e71 MDL-53327 search: add missing pluginfo lang strings
AMOS BEGIN
 CPY [searchengine,admin],[type_search,plugin]
AMOS END
2016-03-03 17:04:24 +08:00
Dan Poltawski
2f1f2d0222 MDL-53247 adminlib: change ordering of global search setup helper
Now put 'enable global search' as last step, thanks to David for the
idea.
2016-03-03 16:51:30 +08:00
Dan Poltawski
f05f9e08cf MDL-53247 search: add cli indexer script 2016-03-03 16:25:32 +08:00
Dan Poltawski
3aff7ed4c5 Merge branch 'MDL-30811-fix3' of git://github.com/andrewnicols/moodle 2016-03-03 15:09:47 +08:00
Andrew Nicols
4ffe7e5070 MDL-30811 output: Adjust ARIA role to alert
https://www.w3.org/TR/wai-aria-practices/#alert
2016-03-03 15:09:18 +08:00
Andrew Nicols
c1cb65d470 MDL-30811 javascript: alert JS should be in template
By moving the JS required for an alert to the JavaScript we make it
possible for themers to use frameworks other than bootstrap if they so
wish.
2016-03-03 15:09:17 +08:00
Andrew Nicols
11a67b211b MDL-30811 javascript: Lazily load core dependencies
To prevent possible race conditions, we lazily load the templates, and ajax
dependencies.
2016-03-03 14:47:07 +08:00
Dan Poltawski
7c7757185a MDL-53247 search: allow search to be configured before enabled
The seach manager no longer checks if search is enabled before providing
an instance. It's up to the callers to do the access control.
2016-03-03 12:31:21 +08:00
Russell Smith
116094595d MDL-53323 profiling: Close session as early as possible. 2016-03-03 12:45:16 +11:00
Andrew Nicols
ebdbc82b82 MDL-48362 enrol_cohort: Correct variable naming for course sync
$course->id => $instance->courseid
2016-03-03 07:55:10 +08:00
Eric Merrill
bfd6c78f63 MDL-53281 search: Properly set timeout, and don't wait for optimize 2016-03-02 17:32:03 -05:00
Ben Kelada
023d6a6756 MDL-53291 javascript: fix jquery ajax requests when data contains ??
jQuery ajax requests containing multiple '?' get replaced with a
string similar to jQuery152330039032_1231231, this is because it
is processing a stringified data object as jsonp and thinks its a url.
 workaround is to add contenttype
see https://github.com/jquery/jquery/issues/1799
2016-03-03 09:15:24 +11:00
AMOS bot
6b893bde60 Automatically generated installer lang files 2016-03-03 00:04:04 +08:00
Eloy Lafuente (stronk7)
5aac4a23e5 Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle 2016-03-02 16:36:03 +01:00
Juan Leyva
ee6aa74081 MDL-52974 mod_assign: Include missing local library 2016-03-02 10:34:20 +01:00
Dan Poltawski
5be405fa4a MDL-53050 mod_forum: fix for base highlight 2016-03-02 17:18:51 +08:00
Dan Poltawski
852f32f7b3 Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle 2016-03-02 15:49:45 +08:00
Marina Glancy
d2de503c80 MDL-50887 antivirus: clamav is standard plugin, missing strings 2016-03-02 15:42:35 +08:00
Frederic Massart
28f8993d0f MDL-52068 repository: Prevent JS errors due to unescaped lang strings 2016-03-02 15:34:45 +08:00