David Mudrák
3759e7ae96
MDL-50033 lang: Update Behat scenarios to use the new strings
2015-04-29 23:15:44 +02:00
Helen Foster
0634dc3b76
MDL-50033 lang: Merge English strings from the en_fix language pack
2015-04-29 21:43:00 +02:00
Frederic Massart
94e6f38fa6
MDL-50038 my: Redirect admin users to the notifications page when needed
2015-04-29 18:56:56 +08:00
Dan Poltawski
f60ea7d7df
Merge branch 'MDL-50041-master' of git://github.com/FMCorz/moodle
2015-04-29 11:53:47 +01:00
Frederic Massart
cda2a8273a
MDL-50041 gdlib: Badges need PNG files from process_new_icon()
2015-04-29 18:50:20 +08:00
Adrian Greeve
dc769673fa
MDL-49843 navigation: Fixed fatal error when viewing reports.
2015-04-29 11:28:55 +01:00
Neill Magill
ccd3dd5bc9
MDL-49583 enrol: enrol/index.php page doesn't handle direct access well
...
Before this patch if a user who is not logged in to Moodle accesses the
enrol/index.php page directly they were redirected to the Moodle front
page after login, rather than back to a page that would allow them to
self enrol, if it is enabled on the course.
This change will cause a user who directly accesses the page to be
redirected back to it after they have logged in, unless the course has guest
access enabled.
Thanks to Marina Glancy for suggesting the use of get_referer()
2015-04-29 09:22:14 +01:00
Andrew Nicols
3db610583e
Merge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle
2015-04-29 13:40:44 +08:00
David Monllao
2296285748
Merge branch 'MDL-50026' of git://github.com/timhunt/moodle
2015-04-29 13:25:02 +08:00
Ankit Agarwal
b647db20e1
MDL-49928 userprofile: Reorder blocks
2015-04-29 10:15:00 +05:30
Andrew Nicols
2fac3c3c5f
Merge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle
2015-04-29 12:18:52 +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
Dan Poltawski
a6dbe2fb1a
Merge branch 'wip-mdl-49974' of https://github.com/rajeshtaneja/moodle
2015-04-28 15:01:08 +01: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
Tim Hunt
299d77dd5a
MDL-50028 qtype_match: fix correct answer display
...
Atto's stupid tendency to create HTML like
<p>You don't need a br at the end of a paragraph!</br></p>
was breaking it.
2015-04-28 13:07:26 +01:00
Tim Hunt
c70c18c0e3
MDL-50028 questions: split into one testcase class per file
2015-04-28 13:07:25 +01:00
Dan Poltawski
84ea226616
on-demand release 2.9beta+
2015-04-28 10:13:37 +01:00
Frederic Massart
c7d5ca8d16
MDL-49981 badges: Missing link to manage your badges
2015-04-28 10:13:36 +01:00
Frederic Massart
ca6f3a8b5f
MDL-49911 admin: Prevent notices when updatenotifications is disabled
2015-04-28 10:13:36 +01:00
Dan Poltawski
77a8c9aae3
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-04-28 10:11:18 +01:00
David Monllao
1d47b81928
Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle
2015-04-28 10:11:18 +01:00
David Monllao
1f619e8d60
Merge branch 'MDL-42449' of git://github.com/andrewhancox/moodle
2015-04-28 10:11:17 +01:00
Andrew Nicols
1c193d49f0
Merge branch 'MDL-49926-master' of git://github.com/mastnym/moodle
2015-04-28 10:11:16 +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
Adrian Greeve
12261113a9
MDL-49888 navigation: Added missing reports to user profile.
...
Added statistics and grade to the reports section in the user
profile.
2015-04-28 14:30:26 +08:00
Juan Leyva
9a3f7a484d
MDL-49954 forum: Use clean_returnvalue properly in external unit tests
2015-04-27 18:22:49 +02:00
AMOS bot
99b679b385
Automatically generated installer lang files
2015-04-28 00:04:09 +08: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
6e28c039cb
Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle
2015-04-27 11:03:32 +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
AMOS bot
170497cd22
Automatically generated installer lang files
2015-04-25 00:04:04 +08:00
Andrew Hancox
baba473b24
MDL-42449 backup: Fix for activity grade category
...
Retain grade category when restoring an activity into the course that
it came from
2015-04-24 13:59:18 +01:00
Dan Poltawski
d5d23acdf5
on-demand release 2.9beta+
2015-04-24 12:10:20 +01:00
Dan Poltawski
14c5b3a23f
Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle
2015-04-24 10:19:21 +01:00
Andrew Nicols
b083e0f6f2
Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle
2015-04-24 10:19:20 +01: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
Dan Poltawski
9548d1e058
Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle
2015-04-24 10:19:18 +01:00
