mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
77,259 Commits 36 Branches 519 Tags
Commit Graph

77259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
020d27a733 Merge branch 'MDL-53281-master' of git://github.com/merrill-oakland/moodle 2016-03-09 09:25:07 +08:00
Andrew Nicols
65e7fee267 Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle 2016-03-09 08:48:44 +08:00
Andrew Nicols
f4b6081ebf Merge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle 2016-03-09 08:35:14 +08:00
Simey Lameze
85984545a9 MDL-53031 mod_assign: add session check on assignment plugins management 2016-03-08 19:46:07 +01:00
Jun Pataleta
8e24a54e52 MDL-52433 user: Remove unnecessary capability check 2016-03-08 12:23:44 +01:00
Cameron Ball
fa8e27b32b MDL-52522 grades: Add rescale grades option for grade categories. 
When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.
 2016-03-08 16:26:44 +08:00
David Monllao
406151d8e2 Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle 2016-03-08 16:13:42 +08:00
David Monllao
d94df7afa8 MDL-41648 gradingforms: Remove unnecessary attr 2016-03-08 15:32:19 +08:00
David Monllao
f084c4b231 Merge branch 'wip-MDL-41648' of https://github.com/dg711/moodle 2016-03-08 15:32:17 +08:00
Andrew Nicols
540394e1db Merge branch 'MDL-49897' of https://github.com/rushi963/moodle 2016-03-08 15:05:50 +08: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
d5f05f77f3 Merge branch 'MDL-53010-master' of git://github.com/lameze/moodle 2016-03-08 14:34:17 +08:00
David Monllao
e86fb5043f Merge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle 2016-03-08 14:29:24 +08:00
David Monllao
f53b50e628 Merge branch 'MDL-52984' of https://github.com/rushi963/moodle 2016-03-08 14:04:07 +08:00
David Monllao
68e8a61fb1 Merge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle 2016-03-08 13:57:30 +08:00
Andrew Nicols
94d4d0179a Merge branch 'MDL-53047-login-anchor' of https://github.com/brendanheywood/moodle 2016-03-08 13:15:00 +08:00
Cameron Ball
18ec7521da MDL-52718 block_community: Send XML-RPC request correctly 
mnet has its own separate XML-RPC implementation which supports
introspection. So even though we were sending incorrectly formatted
parameters, our previous XML-RPC implementation could work out how
to mangle the parameters to be correct. Introspection is not a
part of the XML-RPC specification and we should not rely on it. Our
current XML-RPC client/server implementation does not support it either.

Therefore we should always send data in the expected format.
 2016-03-08 10:46:14 +08:00
Simey Lameze
b324802f36 MDL-51167 tool_monitor: check course visibility and user capabilities 2016-03-08 03:08:33 +01:00
Andrew Nicols
8a3d695d6c Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle 2016-03-08 09:21:47 +08:00
David Monllao
36d6f2d0c9 Merge branch 'MDL-53247-master' of git://github.com/danpoltawski/moodle 2016-03-08 09:17:13 +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
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
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
Brendan Heywood
e1d6edb3b4 MDL-53047 login: Fixed #anchor being lost after login process 2016-03-04 22:54:11 +11:00
John Okely
e42b23ebe2 MDL-50218 lti: Return empty grade when none exists 2016-03-04 16:26:08 +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
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