Commit graph

1674 commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
2be9a45389 Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle 2015-04-27 10:46:08 +01:00
Mark Nelson
ccc1bc7e2e MDL-49977 mod_assign: added missing page titles 2015-04-23 16:24:18 -07:00
David Monllao
e5c5ced912 Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle 2015-04-22 17:02:19 +08:00
Tony Butler
2224f2c598 MDL-49933 mod_assign: Sort marker select lists alphabetically by name 2015-04-21 16:58:38 +01: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
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
Dan Poltawski
aa96a20027 Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle 2015-04-16 10:32:14 +01:00
Juan Leyva
7f45111e36 MDL-49837 assign: Use correct assertions and fix return params cleaning 2015-04-15 12:21:38 +02:00
Juan Leyva
13e814bcb1 MDL-49837 assign: Fix external functions return declaration
Incorrect use of external_warnings function
2015-04-13 17:34:35 +02:00
Damyon Wiese
46a2fbc4b7 MDL-49412 Navigation: Remaining behat fixed for nav branch
Behat is passing after this change.

Part of MDL-45774.
2015-04-10 17:19:28 +08:00
Damyon Wiese
221210e9b2 MDL-49412 Behat: Fix behat tests for all of @mod
This is after the navigation changes for 2.9.

Part of MDL-45774.
2015-04-10 17:18:23 +08:00
Dave Cooper
81d7de1aa1 MDL-48936 lang: Changed "My Home" to "Dashboard".
Part of MDL-45774
2015-04-10 17:16:27 +08:00
Rajesh Taneja
bed022decb MDL-48159 mod_assign: Use proper step to navigate to homepage 2015-04-09 11:13:33 +08:00
Rajesh Taneja
3072d006be MDL-48159 mod_assign: Fixed behat to pass on chrome
Chrome driver doesn't support clicking on
link which wrap on multiple lines. In this
case link is wrapped in navigation block
and was failing on chrome.
2015-04-09 11:07:34 +08:00
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02:00
Andrew Hancox
e528997a4a MDL-48159 mod_assign: Added setting preventsubmissionnotingroup
If enabled a user will be unable to make a submission unless they are a
member of a group.
2015-04-07 14:30:40 +01:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
2015-04-07 10:11:53 +01:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Rajesh Taneja
bf38226162 MDL-49708 behat: Resize window back to default
Leaving window size to large fails in chrome
Reset it to default size works to ensure stamp
is visible by selenium driver
2015-03-30 17:29:33 +08:00
Juan Leyva
0be81772f0 MDL-49617 webservices: Additional tests for the new function 2015-03-26 15:55:23 +01:00
Juan Leyva
4e2e3c9528 MDL-49617 webservices: Return additional fields in get_assignments WS 2015-03-26 15:55:22 +01:00
Rajesh Taneja
56159e91d7 MDL-49445 behat: Change selector as underline tr has same string 2015-03-19 12:24:49 +01:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
David Monllao
e967111644 MDL-48682 behat: Changing window size on specific tests 2015-03-06 11:02:45 +08:00
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
2015-02-23 09:14:05 +08:00
Tim Price
e1de40f7f7 MDL-18177 backup: adding PHPdocs blocks 2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd MDL-18177 backup: addressing coding standards 2015-02-20 11:45:23 +11:00
Matt Sammarco
868b086c4a MDL-18177 backup: Add backup option to include groups and groupings 2015-02-20 11:45:22 +11:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30