Eloy Lafuente (stronk7)
777361983c
Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle
2017-01-11 02:42:29 +01:00
Eloy Lafuente (stronk7)
122c3aff5c
Merge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle
2017-01-11 02:29:49 +01:00
sam marshall
66234de24c
MDL-57515 Resource: 'not very efficient' with a large number of files
...
Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)
2017-01-10 17:43:46 +00:00
Loc Nguyen
288ac7b9d7
MDL-57586 workshop: Change workshop variable protected to public
...
In class workshop_assessment_base, change $workshop from protected to public.
2017-01-10 14:22:11 +07:00
Marina Glancy
fdc6656a37
MDL-56271 mod_feedback: recaptcha was not working
2017-01-10 14:08:04 +08:00
Dan Poltawski
76bab36896
MDL-57604 mod_assign: fix incorrect user being selector from chooser
...
Previously there was a logic bug where by if some students were filtered
from the list, the label for another student could be attached to the
'filered' student.
This fix reworks the promises a bit so we render the student summary and
then build an row with the explict user id, rather than itterating through
the array later.
I also remove the storing of the initial promise in a varible because
this is an easy way to introduce a bug (not waiting for the .then()
chained promise)
2017-01-09 20:36:30 +00:00
Dan Poltawski
3b2c5923f2
Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle
2017-01-09 08:27:18 +00:00
Dan Marsden
6c563ccedf
MDL-45821 mod_scorm: Check lesson_status correctly for multi-sco.
2017-01-09 20:07:31 +13:00
Rajesh Taneja
5d2988fc8a
MDL-57595 behat: Added redirect and wait to ensure next step pass
2017-01-09 12:02:53 +08:00
David Mudrák
82a8d0d21d
MDL-57580 mod_assign: Fix the incorrect type of some input parameters
...
The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().
Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.
* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
some other parts of the assignment code (such as feedback forms).
* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
constants and is supposed to be alpha in external function input
parameters handling, too.
2017-01-05 17:39:36 +01:00
Davo Smith
255d3aaaed
MDL-56449 mod_assign: fix formatting of group warnings
2017-01-05 15:30:09 +00:00
Dan Poltawski
7716be5ae8
Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
2017-01-05 10:09:17 +00:00
Daniel Thee Roperto
b51f6864c1
MDL-57576 assignment: Overwrite feedback file if it has the same name.
2017-01-05 15:33:28 +11:00
Helen Foster
442879042c
MDL-57563 lang: Merge English strings from the en_fix language pack
2017-01-04 22:03:08 +01:00
David Mudrák
1af801be98
MDL-56225 mod_forum: Fix inability to edit attachments
...
The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.
There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.
2017-01-04 11:34:01 +00:00
David Monllao
9afc02742b
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
2017-01-04 11:34:00 +00:00
Andrew Nicols
6528ec3505
MDL-56225 mod_forum: Remove unnecessary attributes from update
2017-01-04 11:33:57 +00:00
Davo Smith
e7f3fd59d4
MDL-56449 mod_assign: fuller description of group submission problems
2017-01-04 10:35:41 +00:00
Dan Marsden
e68cdceee3
MDL-49557 mod_scorm: optionally strip quotes.
2017-01-04 15:43:46 +13:00
Rajesh Taneja
f2e6dcba51
MDL-52168 behat: Select iframe in which text needs to be checked
2017-01-03 15:14:04 +08:00
Eloy Lafuente (stronk7)
0e5205d36c
Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle
2017-01-03 02:34:58 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors
2017-01-03 09:12:54 +08:00
Dan Poltawski
00e741af48
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
2017-01-02 12:35:11 +00:00
Dan Poltawski
241473ce2e
Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
2017-01-02 12:20:34 +00:00
Dan Poltawski
25a222734e
Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
2017-01-02 11:16:27 +00:00
Dan Poltawski
5d970e1aa0
Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle
2016-12-29 11:46:47 +00:00
Dan Poltawski
398e8fa1ed
Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle
2016-12-28 21:19:03 +00:00
Dan Poltawski
16cfeccad8
Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle
2016-12-28 21:19:02 +00:00
Dan Marsden
63c2ea5038
MDL-52168 mod_scorm: Fix issue when scorm does not define org.
2016-12-28 10:54:49 +13:00
Adrian Greeve
a7eb619b76
MDL-57464 mod_lesson: fix notice with sub-clusters.
2016-12-23 11:10:20 +08:00
Dan Marsden
39eee56fa6
MDL-49557 mod_scorm: fix AICC pre-requisite handling.
2016-12-23 12:21:53 +13:00
Dan Marsden
9536334dca
MDL-50643 mod_scorm: redirect using current window instead of parent.
2016-12-23 10:17:43 +13:00
Rajesh Taneja
3b7a351d69
MDL-57494 behat: Fixed tags and removed reset in after_scenario
...
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
2016-12-22 12:42:39 +08:00
Mark Nelson
cc4fba8636
MDL-55955 mod_quiz: ensure duplicated override events are removed
2016-12-22 12:41:32 +08:00
Rajesh Taneja
6749b071d9
MDL-53814 behat: Use table step to check for string
2016-12-21 07:35:07 +08:00
David Monllao
d6db7a1d9a
Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
2016-12-20 11:09:39 +01:00
Dan Poltawski
9c9201ecde
MDL-56640 lesson: switch from YUI to jquery.change()
2016-12-20 10:02:06 +00:00
Adrian Greeve
0a36b931e2
MDL-57366 mod_lesson: Zero now acceptable numeric answer.
...
When creating a numerical question. If the answer to the
question is 0 then the answer will not save.
2016-12-20 14:01:30 +08:00
Rajesh Taneja
7737744d1b
MDL-53814 behat: Columns have been moved ahead
2016-12-20 11:36:00 +08:00
Dan Poltawski
7d64e2c3bc
Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle
2016-12-19 14:33:05 +00:00
David Monllao
e3578224cc
Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle
2016-12-19 14:59:13 +01:00
Dan Poltawski
64e032b6da
Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle
2016-12-19 12:21:06 +00:00
David Monllao
eacacae8cc
Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle
2016-12-19 12:46:19 +01:00
David Monllao
034996876c
Merge branch 'MDL-57402' of git://github.com/timhunt/moodle
2016-12-19 12:20:57 +01:00
David Monllao
2b5c9f04e3
Merge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https://github.com/lucaboesch/moodle
2016-12-19 11:38:43 +01:00
Juan Segarra Montesinos
669da91d54
MDL-53367 mod_forum: Subscribe current users when importing a forum
...
Subscribes currently enrolled users when importing a forum with
automatic subscription enabled.
2016-12-16 09:46:07 +01:00
Tim Hunt
1a07d5ef82
MDL-57402 quiz editing: fix add heading after remove page break
2016-12-14 16:34:50 +00:00
Stephen Bourget
71cfa70a0e
MDL-55568 chat: chat_refresh_events should only create published events
2016-12-13 18:52:33 -05:00
Eloy Lafuente (stronk7)
6296803878
Merge branch 'MDL-55809-master' of https://github.com/xow/moodle
2016-12-13 20:05:15 +01:00
Dan Poltawski
ae2bf1626c
Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle
2016-12-13 14:55:50 +00:00
