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

77681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Champ
ddf98ccac3 MDL-39524 setuplib: Improve get_real_size() performance and readability 2016-03-03 11:05:48 -05: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
Russell Smith
c1518631e3 MDL-52945 modinfo: Avoid uservisible when module already used. 2016-03-03 16:03:19 +11: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
Andrew Nicols
3247e9ef4b Merge branch 'MDL-53214-master-category-feedback' of git://github.com/cameron1729/moodle 2016-03-02 14:49:20 +08:00
Cameron Ball
9566b021db MDL-53214 grades: Fix labels on feedback fields 2016-03-02 14:21:39 +08:00
Andrew Nicols
2f244f1cc6 MDL-30811 core: Initiate notifications on first use only 2016-03-02 13:30:09 +08:00
Dan Poltawski
bc48a198ab Merge branch 'MDL-52513' of https://github.com/rushi963/moodle 2016-03-02 13:23:56 +08:00
Eloy Lafuente (stronk7)
df190d18a1 MDL-52136 mod_forum: fix some out-of-sync stuff 
Thanks CIs!
 2016-03-02 05:42:29 +01:00
Andrew Nicols
5e785ab084 Merge branch 'MDL-48362-master-fix3' of http://github.com/damyon/moodle 2016-03-02 12:36:56 +08:00
Damyon Wiese
72fcaae76d MDL-48362 enrol: Fixes to cohort and manual enrol plugins 
These were regressions from the change to use the standard editing ui
for enrolment plugins.
 2016-03-02 12:34:00 +08:00
Eloy Lafuente (stronk7)
ce878562f3 Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle 2016-03-02 05:25:57 +01:00
Andrew Nicols
e5a1f7d92a MDL-52136 mod_forum: forum_post is templatable 2016-03-02 12:10:57 +08:00
Dan Poltawski
cc32a710ee Merge branch 'MDL-52397_behat2' of git://github.com/dmonllao/moodle 2016-03-02 11:48:39 +08:00
Dan Poltawski
8ad1868683 Merge branch 'wip-mdl-51075' of https://github.com/rajeshtaneja/moodle 2016-03-02 11:47:13 +08:00
Rajesh Taneja
677ba15853 MDL-51075 behat: Fixed exported question file size 2016-03-02 11:39:10 +08:00
David Monllao
b97356f215 MDL-52397 behat: Another behat fix, there is no student2 grade 2016-03-02 11:03:01 +08:00
Andrew Nicols
121a0d12fb Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle 2016-03-02 09:08:29 +08:00
Andrew Nicols
ca0227dd18 MDL-52136 mod_forum: Correctly quote get_string vars in mustache 2016-03-02 09:00:28 +08:00
Andrew Nicols
0b4bff8ca9 MDL-52136 core: Add support for quoting variables in mustache helpers 
This is required for when helpers include json-encoded variables as arguments.
As an example, imagine a template with content:

{{# str }} somekey, someidentifier, { "fullname": "{{ fullname }}" } {{/ str }}

If the fullname variable were to include the double-quote character (e.g.
John "Trevor" Doe) because of the way in which mustache renders content, it
would become:

{{# str }} somekey, someidentifier, { "fullname": "John "Trevor" Doe" } {{/ str }}

This results in an invalid JSON structure.

To work around this issue, the quote characters in the passed variable
must be escaped:

{{# str }} somekey, someidentifier, { "fullname": "John \"Trevor\" Doe" } {{/ str }}

Unfortunately, Mustache provides no way of doing so natively.

With this function, we can quote the text as appropriate:

{{# str }} somekey, someidentifier, { "fullname": {{# quote }}{{ fullname }}{{/ quote }} } {{/ str }}

This also handles the case where the quoted content includes the Mustache
delimeter ({{ or }}).

For example:
fullname = 'John "}}Trevor{{" Doe'

Ordinarily this would be rendered as:
{{# str }} somekey, someidentifier, { "fullname": "John "}}Trevor{{" Doe" } {{/ str }}

This rendering is both a JSON error, and also a mustache syntax error because of the mustache delimeters.

The quote helper also escapes these by wrapping them in change delimeter
tags:

{{# str }} somekey, someidentifier, { "fullname": "John "{{=<% %>=}}}}<%={{ }}=%>Trevor{{=<% %>=}}{{{{=<% %>=}}" Doe" } {{/ str }}
 2016-03-02 08:48:46 +08:00
Eloy Lafuente (stronk7)
192bce5406 Merge branch 'MDL-36652' of https://github.com/rushi963/moodle 2016-03-01 22:01:44 +01:00
Eloy Lafuente (stronk7)
6770a4b3a2 Merge branch 'wip-mdl-53126' of https://github.com/rajeshtaneja/moodle 2016-03-01 21:35:03 +01:00
Eloy Lafuente (stronk7)
25a73245c0 Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle 2016-03-01 21:23:16 +01:00
Rushikesh
f68d8a4151 MDL-49897 Calendar : Calendar day view showing past events 2016-03-01 20:05:51 +05:30
Dan Poltawski
73911de50d MDL-50887 clam: upgrade step with wrong version 2016-03-01 21:37:56 +08:00
Rajesh Taneja
bdd4bed8b5 MDL-53300 core_grade: use currentgradetype if modgrade_type is not set 
If mod has grades, then while upgrading
modgrade_type is disabled. This will not post
it with form and hence validation fails.
To avoid above problem, use ->currentgradetype
if modgrade_type is not set
 2016-03-01 16:38:59 +08:00
Dan Poltawski
b8b7f33acd Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle 2016-03-01 14:56:58 +08:00
Dan Poltawski
2158e87492 Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle 2016-03-01 14:49:33 +08:00
Andrew Nicols
37f39924b5 Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle 2016-03-01 14:35:54 +08:00
Andrew Nicols
9557a603e6 Merge branch 'MDL-52397_fix-oracle' of git://github.com/dmonllao/moodle 2016-03-01 14:35:50 +08:00
Andrew Nicols
5d1a34b076 Merge branch 'MDL-48362-master-fix2' of http://github.com/damyon/moodle 2016-03-01 14:31:29 +08:00