Commit graph

2668 commits

Author SHA1 Message Date
Sam Hemelryk
7a01f7dbc1 Merge branch 'MDL-35427' of git://github.com/netspotau/moodle-mod_assign 2012-09-24 15:00:44 +12:00
Sam Hemelryk
66c0368a9e Merge branch 'MDL-35435' of https://github.com/raymondAntonio/moodle 2012-09-24 14:59:44 +12:00
Sam Hemelryk
8ea8461b3f Merge branch 'MDL-33431' of git://github.com/netspotau/moodle-mod_assign 2012-09-24 14:53:43 +12:00
Dan Poltawski
f8be96ad50 Merge branch 'MDL-35518' of https://github.com/raymondAntonio/moodle 2012-09-24 10:47:05 +08:00
Dan Poltawski
15f4a83b3a Merge branch 'MDL-35337' of git://github.com/netspotau/moodle-mod_assign 2012-09-24 10:44:00 +08:00
Raymond Wijaya
9f484b984f MDL-35521: mod_assign: Remove 'final grade' column from downloaded grading worksheets 2012-09-21 11:36:40 +08:00
Raymond Wijaya
0a66564903 MDL-35252: Fix a bug that creates unneccessary rows in grade_grades table when unchecking 'overridden' check box in gradebook update 2012-09-21 11:26:10 +08:00
Raymond Wijaya
5fc596303f MDL-35435: Fix invalid CSV file when assignment has no enrolled student and submission in offline grading worksheet 2012-09-21 11:19:19 +08:00
Raymond Wijaya
79e7dfcc76 MDL-35389: Fix an error when changing locked state of a assignment is changed 2012-09-21 11:10:34 +08:00
Raymond Wijaya
23fffa2bea MDL-35518: mod_assign: Change function get_renderer() in assign/locallib.php from private to public 2012-09-21 10:53:32 +08:00
Paul Charsley
1f8c8f6125 MDL-31873 added mod_assign_get_grades web service function 2012-09-21 10:29:15 +12:00
Rajesh Taneja
7400be1b6e MDL-34777 Accessibility: Add labels to input elements in gradebook 2012-09-20 11:28:55 +08:00
Damyon Wiese
66d3fe3708 MDL-33431: Allow in page toggling of full/summary of submissions/feedback in assignment 2012-09-20 10:52:30 +08:00
Raymond Wijaya
45a64c19bf MDL-35436: mod_assign : Usability issues: add validation rules in the confirmation page for invalid grades uploaded via csv files 2012-09-19 14:01:53 +08:00
Damyon Wiese
f9e6212700 MDL-35375: Ensure the assignment grading table is always sorted by at least one unique column 2012-09-19 12:56:51 +08:00
Damyon Wiese
ba30fe35b9 MDL-35202: Allow for language files that contain non-ascii for actions in assignment 2012-09-18 15:11:48 +08:00
Damyon Wiese
6664b2c0d0 MDL-35398: Quick grading feedback is now pushed to the gradebook 2012-09-18 14:49:52 +08:00
Rossiani Wijaya
b1fec412e3 MDL-34777 grading: add label to select and input tag
Conflicts:

	mod/assign/lang/en/assign.php
	mod/assign/locallib.php
2012-09-18 13:18:57 +08:00
Damyon Wiese
b32868bed3 MDL-35427: Remove resetting of $_POST - use $mform->setConstant to force update to rownum instead. 2012-09-18 11:17:18 +08:00
Damyon Wiese
b3de95afb4 MDL-35337: Fixes for restoring a course backup with no data for teamassignments and extensionsdates 2012-09-18 10:20:53 +08:00
Dan Poltawski
d3dbb5ce6a Merge branch 'MDL-35388' of git://github.com/netspotau/moodle-mod_assign 2012-09-17 15:40:52 +08:00
Eric Merrill
7aa1a4fab2 MDL-35411 assign Include plugin (submission/feedback) info, even when there is no user data.
assign_plugin_config data was only included in backups/imports if user data was included in
the backup. This patch moves it out with the standard structure of the assign backup.
2012-09-16 17:58:20 -04:00
Eloy Lafuente (stronk7)
bb96b9df18 Revert "MDL-34794: Add reset course feature in mod_assign (new assignment (2.3))"
This reverts commit 72429a10da.
2012-09-14 10:48:07 +02:00
Eloy Lafuente (stronk7)
8be3eeecfe Revert "MDL-34794 mod_assign: Fixed up style after integration"
This reverts commit 20b133e7a3.
2012-09-14 10:47:04 +02:00
Damyon Wiese
49d83b9d96 MDL-35388: Change get_output to get_renderer to remove duplicated function 2012-09-13 10:06:09 +08:00
Damyon Wiese
fd637d38ac Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration
Conflicts:
	mod/assign/locallib.php
2012-09-13 10:03:40 +08:00
Paul Charsley
2cffef9f41 MDL-35388 modifications to allow php unit tests to be run 2012-09-13 13:44:05 +12:00
Sam Hemelryk
37d3caac51 Merge branch 'MDL-34088' of git://github.com/raymondAntonio/moodle 2012-09-12 11:35:41 +12:00
Sam Hemelryk
223285a640 Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle 2012-09-12 10:22:54 +12:00
Eloy Lafuente (stronk7)
ae066a4691 Merge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle 2012-09-11 21:33:06 +02:00
Aparup Banerjee
875d0e5916 MDL-31276 mod_assign Phpdocs polish 2012-09-11 16:53:56 +08:00
Aparup Banerjee
f4f1fd0b6c Merge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign 2012-09-11 16:39:30 +08:00
Damyon Wiese
7a2b911c6b MDL-31276: Phpdocs cleanup for offline grading feature 2012-09-11 15:48:19 +08:00
Sam Hemelryk
6396fb3dab Merge branch 'master_MDL-35255' of git://github.com/danmarsden/moodle 2012-09-11 12:11:02 +12:00
Eloy Lafuente (stronk7)
29636a9af2 Merge branch 'MDL-34660' of git://github.com/raymondAntonio/moodle 2012-09-11 02:08:41 +02:00
Sam Hemelryk
20b133e7a3 MDL-34794 mod_assign: Fixed up style after integration 2012-09-11 11:34:10 +12:00
Damyon Wiese
d0d4796b4a MDL-31276: Fixes for offline marking and team submissions
Filenames in zip of all submission now contains the team group name.
2012-09-10 14:18:42 +08:00
Damyon Wiese
df47b77f46 MDL-31276: Offline marking. Includes download/upload of csv grades.
Also provides bulk upload/download of feedback files via zips.
2012-09-10 14:18:32 +08:00
Raymond Wijaya
ec32d06834 MDL-34088: Advanced grading criteria is shown on assignment page (if used) before the assignment submissions have been graded. 2012-09-07 15:20:32 +08:00
Raymond Wijaya
72429a10da MDL-34794: Add reset course feature in mod_assign (new assignment (2.3)) 2012-09-07 15:06:11 +08:00
Eloy Lafuente (stronk7)
3b70685c26 fix permissions 2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
6f050c7dea MDL-31291 assign: Fix diffs between installed & upgraded DB schema 2012-09-06 18:31:26 +02:00
Aparup Banerjee
d59b488b5a Merge branch 'MDL-31291-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:43:15 +08:00
Aparup Banerjee
89577d774d Merge branch 'MDL-31284-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-06 19:36:24 +08:00
Dan Marsden
c792565b9d MDL-35255 mod_assign plagiarism api shift update_status call to after header has been printed. 2012-09-05 12:44:18 +12:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Damyon Wiese
b98824c219 MDL-31291: Fix a warning on the assignment summary page. 2012-09-03 12:20:39 +08:00
Damyon Wiese
88cfe46998 MDL-31291: Do not show students names who have not submitted when blind marking is enabled. 2012-09-03 11:11:16 +08:00
Damyon Wiese
b473171a6f MDL-31291: Blind marking feature for mod_assign 2012-09-03 11:11:16 +08:00
Damyon Wiese
dd1fe178eb MDL-31284: Fix for plugin summary display in grading table with team submissions 2012-09-03 11:10:03 +08:00