Dan Poltawski
a42a78754f
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
2013-01-23 15:58:34 +08:00
Dan Poltawski
1c426a56f8
Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle
2013-01-23 15:53:20 +08:00
Damyon Wiese
8549deb969
MDL-37082: Fixed failed unit tests from previous patch
2013-01-23 15:23:37 +08:00
Damyon Wiese
d021941d6c
MDL-37547 Assign: Fix failed unit test on oracle.
...
Oracle is rounding numbers with no decimals - which causes a test failure.
2013-01-23 14:56:21 +08:00
Dan Poltawski
bc5165c2be
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
2013-01-23 14:45:59 +08:00
Mark Nelson
18aaeef0b6
MDL-37082 mod_assign: removed reference to deprecated delete_course_module function in the unit tests
2013-01-23 14:25:02 +08:00
Eloy Lafuente (stronk7)
c9c75b39fd
Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle
2013-01-23 02:07:53 +01:00
Dan Poltawski
0a93b3127f
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
2013-01-23 08:53:02 +08:00
Mark Nelson
a347aee32e
MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process
...
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
2013-01-22 17:05:16 +08:00
Aparup Banerjee
1a6192f928
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
2013-01-22 13:57:25 +08:00
Damyon Wiese
c1432fad2c
MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php
...
The failure was caused by a regression in MDL-37527.
2013-01-22 13:34:01 +08:00
Aparup Banerjee
c0038fbe5b
Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle
2013-01-22 10:59:26 +08:00
Aparup Banerjee
5d4183b94f
Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle
2013-01-22 10:56:06 +08:00
Eloy Lafuente (stronk7)
cccdddf241
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
2013-01-22 02:11:27 +01:00
Damyon Wiese
f518843d4c
MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.
2013-01-22 09:04:13 +08:00
Eloy Lafuente (stronk7)
0aaf378cf9
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle
2013-01-22 01:11:48 +01:00
Eloy Lafuente (stronk7)
17f394f81a
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
2013-01-22 01:05:54 +01:00
Sam Hemelryk
0774b0d34c
Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle
2013-01-22 09:10:44 +13:00
Mark Nelson
7e5be0744c
MDL-36104 mod_assign: added hidden labels to the feedback input fields
2013-01-21 12:50:34 +08:00
Dan Poltawski
73ce4ac996
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
2013-01-21 10:53:12 +08:00
Dan Poltawski
66bfd52a62
Merge branch 'MDL-37527-master' of github.com:damyon/moodle
2013-01-21 10:03:34 +08:00
Dan Poltawski
9f780282fa
MDL-31682 - fix for online text assignments
2013-01-17 15:48:29 +08:00
Damyon Wiese
7720f485c9
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.
2013-01-17 14:00:46 +08:00
Damyon Wiese
5389dfb0eb
MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.
...
For advanced upload of files only - this setting was stored in var2.
2013-01-17 12:15:00 +08:00
Damyon Wiese
f531ca72f9
MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"
...
Advanced upload of files has this setting which is stored in var3.
2013-01-17 11:44:57 +08:00
Damyon Wiese
01d29b3907
MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting
...
Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".
2013-01-17 11:05:31 +08:00
Damyon Wiese
cb5b486040
MDL-37547 Assignment: Add unit tests for mod/assign/lib.php
2013-01-16 16:36:19 +08:00
Damyon Wiese
f93fdcef86
MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.
2013-01-16 13:48:15 +08:00
Damyon Wiese
425a634b58
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
...
Reported by Mark Neilsen.
2013-01-16 13:20:27 +08:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Dan Poltawski
0a9b944a15
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-15 11:19:40 +08:00
David Monllao
6b21986911
MDL-37457 testing Mark current classes as deprecated
2013-01-15 11:07:45 +08:00
David Monllao
5c3c2c81be
MDL-37457 testing Refactoring references
2013-01-15 11:07:43 +08:00
Sam Hemelryk
0fe5a201c0
Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
mod/assign/submission/onlinetext/locallib.php
2013-01-15 10:37:54 +13:00
Sam Hemelryk
2d971403e6
MDL-31682 mod_assign: fixed since version on new service.
2013-01-15 10:27:40 +13:00
Sam Hemelryk
ddca5610d3
Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle
...
Conflicts:
mod/assign/version.php
2013-01-15 10:21:20 +13:00
Dan Poltawski
5c2aacc21c
Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle
2013-01-14 15:34:29 +08:00
Jerome Mouneyrac
fb695f6e3d
MDL-37354 clean return value for each externallib PHPUnit tests
2013-01-09 13:47:01 +08:00
Sam Hemelryk
7316589831
MDL-36904 mod_assign: Fixed whitespace issue
2013-01-09 12:33:29 +13:00
Sam Hemelryk
6f51092fbe
Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-09 11:59:43 +13:00
Damyon Wiese
e00b5c454c
MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
...
This allows anyone to view or modify anyone elses submission comments.
2013-01-07 10:48:26 +08:00
Damyon Wiese
47f48152f7
MDL-35413 Assignment: Add unit tests (lots of them).
2013-01-04 15:51:08 +08:00
Damyon Wiese
e5403f8c44
MDL-36904 Assignment: Fix all errors and warnings from codechecker
2013-01-04 15:46:15 +08:00
Damyon Wiese
d6c673ed4e
MDL-36712: Assignment - Do not always send feedback available emails when grade is created
...
The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".
2013-01-04 14:46:14 +08:00
Paul Charsley
c144959c4d
MDL-31682 added mod_assign_get_submissions web service function
2013-01-03 09:46:59 +13:00
Dan Poltawski
b20d65f271
Merge branch 'MDL-37037-master' of git://github.com/damyon/moodle
2012-12-24 12:23:03 +08:00
Sam Hemelryk
bef123d608
Merge branch 'MDL-36966-master' of git://github.com/damyon/moodle
2012-12-24 11:16:26 +13:00
Damyon Wiese
2406815bbf
MDL-37030 Assignment: Fix error on download all submissions.
...
When group submissions and blind marking are enabled, an error is thrown
when a teacher trys to download all submissions in a zip. The fix is to
move the url rewriting from the plugin to the assign class so it is
done in a standard way by all modules. The rewriting is done to make images
in a text editor field resolve correctly.
2012-12-18 12:17:25 +08:00
Damyon Wiese
afa3e637a4
MDL-37037 Assignment Some minor refactoring of the previous patch
...
This just makes the control flow a bit easier to read.
I also added a continue button to take you back to the grading page.
2012-12-18 09:19:23 +08:00
Michael Aherne
5c77835865
MDL-37037 assign Show message if no files to download
2012-12-18 08:54:10 +08:00
