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
David Monllao
2a03c5fe06
MDL-52397 mod_assign: Fix behat test
2016-03-01 14:29:27 +08:00
Damyon Wiese
74aece8719
MDL-48362 enrol_cohort: Fix unit test by manually triggering sync
...
Sync is now automatically triggered by add/update instance. We need
to manually trigger sync before each part of the test to clean up
role assignments from the previous test.
2016-03-01 14:25:48 +08:00
Andrew Nicols
21d43c12b9
MDL-50546 mod_quiz: Correct typos in WS docs
2016-03-01 14:22:06 +08:00
Andrew Nicols
614173c7dc
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
2016-03-01 13:41:35 +08:00
Mark Nelson
989a84577e
MDL-52489 mod_assign: mentioned changes in upgrade.txt
2016-03-01 13:19:02 +08:00
Dan Poltawski
6a9b3c5a48
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle
2016-03-01 13:10:57 +08:00
Dan Poltawski
340d35a902
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
2016-03-01 13:03:06 +08:00
Andrew Nicols
c62413ace3
Merge branch 'MDL-48362-master-fix1' of http://github.com/damyon/moodle
2016-03-01 12:58:54 +08:00
Dan Poltawski
71ea84048d
Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle
2016-03-01 12:53:10 +08:00
Dan Poltawski
de67ef599f
Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle
2016-03-01 12:38:54 +08:00
Dan Poltawski
b23f27fdd2
Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
2016-03-01 12:30:56 +08:00
David Monllao
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
Damyon Wiese
e3f24ac030
MDL-48362 enrol_cohort: Perform immediate sync on add/update instance
...
This restores backwards compatible behaviour.
2016-03-01 12:29:09 +08:00
Andrew Hancox
23b6636997
MDL-51687 mod_folder: Trigger event when downloading all files.
2016-03-01 12:27:55 +08:00
Dan Poltawski
792508cb7f
Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle
2016-03-01 12:26:33 +08:00
Dan Poltawski
fd8e293030
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
2016-03-01 12:23:54 +08:00
Marina Glancy
17f53b45ab
MDL-44952 mod_feedback: set value for hidenoselect if disabled
2016-03-01 12:21:00 +08:00
Andrew Nicols
cf633c555e
MDL-30811 form: Remove continue from test.
2016-03-01 12:11:10 +08:00
Andrew Nicols
64d6465650
MDL-52974 mod_assign: Improve tests for view_submission_status
...
External tests only
2016-03-01 11:50:11 +08:00
Andrew Nicols
05b0f579ca
Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle
2016-03-01 11:48:16 +08:00
Dan Poltawski
c116a115d9
Merge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle
2016-03-01 11:34:04 +08:00
Dan Poltawski
d76acc87f7
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
2016-03-01 10:43:12 +08:00
Andrew Nicols
57ecaf68b8
Merge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle
2016-03-01 10:40:27 +08:00
