David Monllao
119ff65c0e
Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle
2015-05-04 15:16:01 +08:00
John Okely
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
David Monllao
84d83fe7e1
Merge branch 'MDL-49998' of git://github.com/stronk7/moodle
2015-05-01 15:05:42 +08:00
Eloy Lafuente (stronk7)
46686eafeb
MDL-49998 editpdf: Clean code to make it more readable.
...
There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.
Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.
2015-04-30 10:55:08 +02:00
David Monllao
388b0beec1
MDL-49637 mod_assign: Fixing behat test
...
The participant number is dynamically generated so it is not possible to
match known values.
Match on the submission text instead.
2015-04-30 14:03:50 +08:00
Andrew Nicols
c80270fe89
Merge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle
2015-04-30 10:47:33 +08:00
Helen Foster
0634dc3b76
MDL-50033 lang: Merge English strings from the en_fix language pack
2015-04-29 21:43:00 +02:00
David Monllao
2296285748
Merge branch 'MDL-50026' of git://github.com/timhunt/moodle
2015-04-29 13:25:02 +08:00
David Monllao
5c012a7426
Merge branch 'MDL-49637' of git://github.com/NeillM/moodle
2015-04-29 12:04:43 +08:00
Eloy Lafuente (stronk7)
a916d557cf
MDL-49998 unit tests: Close the pdf objects when needed.
...
When a pdf object is instantiated and any file is loaded
with set_pdf() or load_pdf(), the files remain open until
the pdf is saved with pdf_save() or outputted with Output()..
In that cases is needed to perform an explicit Close() in
order to free resources, parsers and, ultimately, fclose()
the files.
Note that only the uses detected in the editpdf unit tests have
been fixed. I'd recommend to analyse every instance of the tcpdf
libs.
Also, there was one incorrecly reused pdf instance in then
generate_combined_pdf_for_attempt() method. Apparently it was not
leading to problems, but better use a separate instance (#246 ).
2015-04-28 19:46:50 +02:00
Eloy Lafuente (stronk7)
095ecde727
MDL-49998 unit tests: files left open are our fault.
...
Get rid of the gc_collect_cycles() that only was
hiding incorrectly left open files. This must be fixed
in code when possible. And pdf libs allow us to do so.
Note that a lot of gc_collect_cycles() were added
in MDL-47675, I'd recommend to take a look to all them,
being replaced by fixes in code when possible.
2015-04-28 19:46:50 +02:00
Tim Hunt
d4572c1716
MDL-50026 quiz: don't show locks for random Qs in deferred feedback
...
can_finish_during_the_attempt was returning the wrong result for
random questions for behaviours like deferred feedback.
2015-04-28 13:37:00 +01:00
Andrew Nicols
b10d72f4e9
Merge branch 'MDL-49814' of git://github.com/timhunt/moodle
2015-04-28 10:11:16 +01:00
Neill Magill
129d26aac4
MDL-49637 assign: Workflow & blind marking do not always show feedback
...
Before this patch if an assignment has workflow and blind marking enabled if a teacher
sets a submission to have its grades released to students before they reveal student
identities the feedback they have given is not displayed to the student.
The patch causes the reveal_identities() method to pass the correct value to the
get_feedback_plugin_by_type() function in the assign class.
2015-04-28 09:05:05 +01:00
Neill Magill
6e972bdd34
MDL-49637 assign: Behat test for blind marking with workflow
...
This test checks that that if reveal student identities is used before or after the submissions grades have
been set released that the teacher's feedback is displayed to students.
2015-04-28 09:04:57 +01:00
Juan Leyva
9a3f7a484d
MDL-49954 forum: Use clean_returnvalue properly in external unit tests
2015-04-27 18:22:49 +02:00
Dan Poltawski
c5cdc8887a
Merge branch 'MDL-49993_master' of git://github.com/grabs/moodle
2015-04-27 14:47:58 +01:00
Rajesh Taneja
ceeab15019
MDL-49948 lesson: Answer and response format should be known for each form
2015-04-27 14:35:20 +01:00
Dan Poltawski
08c8fc50ce
Merge branch 'MDL-49913' of git://github.com/jmvedrine/moodle
2015-04-27 14:28:27 +01:00
Tim Hunt
377ce9938b
MDL-49814 quiz: make question dependency clear in the nav
2015-04-27 13:55:40 +01:00
Dan Poltawski
2be9a45389
Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle
2015-04-27 10:46:08 +01:00
Andreas Grabs
9f78349f58
MDL-49993 mod_feedback: Question auto numbers have no space between number and question
2015-04-26 19:04:40 +02:00
Jean-Michel Vedrine
c914c92da0
MDL-49913 mod_lesson: studentanswer format should be HTML
2015-04-24 19:19:32 +02:00
Jean-Michel Vedrine
cb9d259dcd
MDL-49913 mod_lesson: fix import scores and jumps
2015-04-24 19:19:31 +02:00
Jean-Michel Vedrine
9fb9aa9c91
MDL-49913 mod_lesson: defaultanswer to avoid duplication
2015-04-24 19:19:31 +02:00
Jean-Michel Vedrine
35cec798c2
MDL-49913 mod_lesson: round question grades on import
2015-04-24 19:19:30 +02:00
Andrew Nicols
0264bb1ecb
Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle
2015-04-24 10:19:20 +01:00
Dan Poltawski
5975d9521a
Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle
2015-04-24 10:19:19 +01:00
David Monllao
9dbcdd8b1f
Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle
2015-04-24 10:19:18 +01:00
Mark Nelson
ccc1bc7e2e
MDL-49977 mod_assign: added missing page titles
2015-04-23 16:24:18 -07:00
M Kassaei
32498c28ea
MDL-49813 quiz: add sections in the right place after page changes
2015-04-23 16:54:50 +01:00
Juan Leyva
8352aa50f3
MDL-49937 data: Handle admins/managers in get_databases_by_courses
2015-04-23 09:37:06 +02:00
Jean-Michel Vedrine
6197497393
MDL-49946 mod_lesson: improve qformat_default::defaultquestion
2015-04-22 19:40:19 +02:00
Dan Poltawski
a8d8783988
Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle
2015-04-22 16:40:15 +01:00
David Monllao
e5c5ced912
Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle
2015-04-22 17:02:19 +08:00
Juan Leyva
c8f1d8a026
MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses
2015-04-22 09:47:18 +02:00
Tony Butler
2224f2c598
MDL-49933 mod_assign: Sort marker select lists alphabetically by name
2015-04-21 16:58:38 +01:00
Andrew Nicols
9d745218e8
Merge branch 'MDL-49902-master' of git://github.com/jleyva/moodle
2015-04-21 11:40:39 +08:00
Andrew Nicols
793645a03f
Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle
2015-04-21 10:43:48 +08:00
Rajesh Taneja
0fe86bbdbb
MDL-49799 behat: replaced asd.com with example.com
...
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
David Monllao
b312e7f13a
Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin-umn/moodle
2015-04-17 10:41:20 +08:00
Juan Leyva
ea2fa324d7
MDL-49902 forum: Add missing capability check in mod_forum_view_forum
2015-04-16 22:07:11 +02:00
Dan Poltawski
8da277ea96
Merge branch 'MDL-49894-master' of git://github.com/jleyva/moodle
2015-04-16 16:10:23 +01:00
Juan Leyva
6d28e2cfa6
MDL-49894 webservices: Add missing API changes in upgrade.txt
2015-04-16 15:19:42 +02:00
Juan Leyva
b235aef094
MDL-49894 forum: Add deprecated information for get_forum_discussions
2015-04-16 14:53:11 +02:00
Dan Poltawski
aa96a20027
Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle
2015-04-16 10:32:14 +01:00
Dan Poltawski
8c1444e4a4
Merge branch 'MDL-49763-master' of git://github.com/jleyva/moodle
2015-04-15 15:53:17 +01:00
Dan Poltawski
7068541fff
Merge branch 'MDL-49803_master' of git://github.com/dmonllao/moodle
2015-04-15 15:06:17 +01:00
Juan Leyva
7f45111e36
MDL-49837 assign: Use correct assertions and fix return params cleaning
2015-04-15 12:21:38 +02:00
Dan Poltawski
75e20c1845
Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
2015-04-15 09:54:36 +01:00
