16774 Commits

Author SHA1 Message Date
Ankit Agarwal
23e9968a25 MDL-50276 forums: Add a new line in forum emails 2015-05-19 11:46:00 +05:30
David Monllao
88d127d37c Merge branch 'MDL-34102' of git://github.com/jmvedrine/moodle 2015-05-12 12:08:30 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Rajesh Taneja
f84a0d49c1 MDL-50154 behat: Resize pdf window so toolbar is always visible 2015-05-08 11:17:39 +08:00
Rajesh Taneja
0ce090c09a MDL-50154 behat: Click on Grades link under navigation 2015-05-08 10:06:39 +08:00
Eloy Lafuente (stronk7)
7a69b19596 Merge branch 'MDL-50136-master' of git://github.com/ankitagarwal/moodle 2015-05-07 19:34:00 +02:00
Eloy Lafuente (stronk7)
88ffe4020f Merge branch 'MDL-50152' of git://github.com/timhunt/moodle 2015-05-07 16:18:35 +02:00
Tim Hunt
f459f29b6f MDL-50152 forum: show if last post in a thread is unread. 2015-05-07 10:38:32 +01:00
Ankit Agarwal
991efb8b1a MDL-50136 database: Update css of search box 2015-05-07 13:40:44 +05:30
David Monllao
0f186bd62d Merge branch 'MDL-50110' of git://github.com/ramdesh/moodle 2015-05-07 12:16:03 +08:00
Frederic Massart
546a58bcdc MDL-50128 mod_data: String needed escaping before being used in regex 2015-05-07 11:19:47 +08:00
Andrew Nicols
7ae030d54e Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
2015-05-07 10:24:11 +08:00
Dan Marsden
a374769640 MDL-50133 mod_scorm: use correct captypes 2015-05-07 11:43:28 +12:00
Ramindu Deshapriya
83679e0fb9 MDL-50110 mod_book: Added Behat test to automate MDLQA-7646 2015-05-07 01:52:18 +05:30
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Salih Gedik
683f717919 MDL-49789 mod_book: filter book chapter content 2015-05-06 13:54:24 +08:00
Andrew Nicols
43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
Conflicts:
	mod/forum/post.php
2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7)
15005d91f0 MDL-50102 versions: coding style cleanup. 2015-05-05 18:23:21 +02:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Frederic Massart
b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Frederic Massart
dd0607b7bb MDL-49179 mod_forum, mod_quiz: Prevent misuse of get_referer() 2015-05-05 18:31:13 +08:00
Tim Hunt
e51fdfe0cb MDL-49941 quiz: mod/quiz:grade should declare RISK_XSS 2015-05-05 18:31:13 +08:00
Mark Nelson
9542b15671 MDL-49985 core_enrol: direct user to appropriate URL 2015-05-05 01:17:23 -07:00
Mark Nelson
b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309
This reverts commit 6601690202764d786a5ee4b7bbd9afb5b91dd0ec.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
2015-05-05 01:09:20 -07:00
David Monllao
a7f81bc72d Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle 2015-05-05 10:21:06 +08:00
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
Ankit Agarwal
0174fa9bc0 MDL-48002 inbound: add tests for evolution 2015-05-04 08:00:01 +05:30
Ankit Agarwal
aef3c18b76 MDL-48002 inbound: Remove quoted text from forum emails 2015-05-04 08:00:00 +05:30
Jean-Michel Vedrine
2107531f3c MDL-34102 mod_lesson: display feedback
Feedback for incorrect answer was not diplayed when
Provide option to try a question again was set to Yes.
2015-05-02 15:01:17 +02: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