Commit graph

1052 commits

Author SHA1 Message Date
Sam Hemelryk
6aed99dd0a Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle 2013-08-05 15:46:59 +12:00
Davo Smith
2a081f127d MDL-40937 mod_assign - remove debugging code from 'previous submissions' javascript, that was breaking in IE8/IE9 2013-07-30 11:35:30 +01:00
Paul Charsley
d1ec5c839a MDL-40547 assign: tests for workflow/allocation 2013-07-30 16:02:21 +08:00
Dan Poltawski
d713ba95f0 Merge branch 'MDL-40548' of https://github.com/Lightwork-Marking/moodle 2013-07-30 09:58:21 +08:00
Dan Poltawski
3047527093 Merge branch 'MDL-39359_master' of https://github.com/pauln/moodle 2013-07-29 13:45:50 +08:00
Damyon Wiese
fafad009f3 MDL-34989 assign: Do not add a param to grading_disabled - cannot be backported. 2013-07-29 09:55:46 +08:00
Ashley Holman
c33b4c81bb MDL-34989 assign: Allow students to submit when grade is overriden
Also inform teachers when grading is disabled due to gradebook lock/override.
2013-07-29 09:55:36 +08:00
Paul Charsley
07df8c38d9 MDL-40548 added mod_assign_get_user_flags and
mod_assign_get_user_mapping
2013-07-29 10:36:17 +12:00
Paul Charsley
912cbaf16d MDL-40547 added marking allocation and workflow to
mod_assign_get_assignments
2013-07-29 09:09:57 +12:00
Paul Nicholls
381e6d7359 MDL-39359 - mod/assign: Allow zipped folder to be uploaded for returning feedback files
The "Upload multiple feedback files in a zip" feature is convenient, but requires that
the files sit directly within the zip file. As the files will most likely be extracted
to a folder after downloading, it's quite reasonable to expect teachers to zip the
folder up rather than selecting all files and zipping them.  This patch allows for a
zipped folder to be uploaded; if the only file found after extracting is a directory,
the contents of the directory are used instead of the results of the extraction.
2013-07-24 13:50:25 +12:00
Marina Glancy
170f6e60a2 MDL-33563 Grading methods allow decimal grades 2013-07-19 15:12:40 +10:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Damyon Wiese
539819dc40 Merge branch 'MDL-40195' of git://github.com/aolley/moodle 2013-07-16 13:28:52 +08:00
Raymond Wijaya
bf57184c28 MDL-40093: mod/assign: Remove count of drafts in offline assignment's grading summary screen 2013-07-10 11:18:28 +10:00
Marina Glancy
9a2188812d Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:58:09 +10:00
Marina Glancy
f429d25d37 MDL-40472 fixed missing semicolon 2013-07-09 22:01:49 +10:00
Marina Glancy
ed2896d990 Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle 2013-07-09 21:34:49 +10:00
Dan Poltawski
3a1b0dd908 Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle 2013-07-09 16:57:07 +08:00
Adrian Greeve
329846f198 MDL-40430 - Libraries: Deprecate print_context_name(). 2013-07-09 16:11:55 +08:00
Marina Glancy
73118a2687 Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle 2013-07-09 18:06:33 +10:00
Rajesh Taneja
df6c384d55 MDL-40218 Assignment: updated upgrade.txt and version number 2013-07-09 14:09:11 +08:00
Rajesh Taneja
1ecb8044b6 MDL-40218 Assignment: Added lazy loading for showactiveenrol option and supended users 2013-07-09 14:09:11 +08:00
Rajesh Taneja
e6cc5347eb MDL-40218 Assignment: Added unit test to check suspended users 2013-07-09 13:32:10 +08:00
Rajesh Taneja
3fa106d0d6 MDL-40218 Assignment: User should not be able to view submissions, whithout proper permissions 2013-07-09 13:32:09 +08:00
Rajesh Taneja
c494e18cbd MDL-40218 Assignment: Participants/submission/grade count only include active users 2013-07-09 13:32:08 +08:00
Rajesh Taneja
a69944eb8b MDL-40218 Assignment: Show suspended user, similar to the way they are shown in grader report 2013-07-09 13:32:08 +08:00
Rajesh Taneja
4c4c7b3f3f MDL-40218 Assignment: Added show/hide suspended users functionality 2013-07-09 13:32:08 +08:00
Adam Olley
dd8ba80005 MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places 2013-07-08 20:04:59 +09:30
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Damyon Wiese
13e82f1c67 MDL-40472: Clean all codechecker warnings on mod_assign 2013-07-03 16:00:43 +08:00
Nadav Kavalerchik
8137e0496e MDL-37065 - Change get_string('status') token in assignment submissions page to a different token (for translation flexibility)
AMOS BEGIN
 CPY [status,core],[status,mod_assign]
AMOS END
2013-07-03 14:59:52 +08:00
Ankit Agarwal
bea86e845e MDL-34472 libraries: Remove usage of get_context_instance() from core 2013-07-01 15:40:37 +08:00
Sam Hemelryk
7bb2a9586e Merge branch 'MDL-39760-master' of https://github.com/lucisgit/moodle 2013-06-24 14:30:49 +12:00
Sam Hemelryk
45aac51a3c MDL-38376 mod_assign: fixed whitespace 2013-06-24 11:05:51 +12:00
Amanda Doughty
ea698284cf MDL-38376 mod_assign: Feedback displayed when Grade set to hidden 2013-06-24 10:16:04 +12:00
Ruslan Kabalin
450fde4e16 MDL-39760: mod_assign: Add few more callback methods.
Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.
2013-06-19 14:51:46 +01:00
Sam Hemelryk
e41ecc6260 Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle 2013-06-17 14:30:24 +12:00
Damyon Wiese
1fba9cf66a MDL-37621 assign: Fix for DB error on update.
This properly handles the case when the teamsubmissiongroupingid is disabled.
2013-06-13 15:15:07 +08:00
Dan Poltawski
e3b472e82c Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-13 10:15:25 +08:00
Dan Marsden
8a309823f0 MDL-38359: assign - prevent loss of associated marker
certain markers don't see the marker allocation column.
2013-06-12 21:29:39 +12:00
Dan Marsden
24835a1292 MDL-38359: assign - fix some issues with releasing grades 2013-06-12 21:16:12 +12:00
Dan Poltawski
85937391e1 Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle 2013-06-12 16:47:38 +08:00
Dan Marsden
b6d1b761a4 MDL-38359: assign - remove some old debug code. 2013-06-12 20:18:07 +12:00
Damyon Wiese
c7cd8d9c84 MDL-37621 assign: Improvements to default settings.
Added a new adminsetting_configempty type so that module settings
which can have no sensible defaults can still be configured as advanced.
2013-06-12 14:20:02 +08:00
Damyon Wiese
de6a0a394b MDL-37621 assign: Improvements to assignment default settings.
Remove locked flag from datetime settings.
Change requiresubmissionstatement to use the new admin flags instead of it's previous custom behaviour.
This means there is a language change:

AMOS BEGIN
 CPY [requiresubmissionstatementassignment_help,mod_assign],[requiresubmissionstatement_help,mod_assign]
AMOS END
2013-06-12 14:19:52 +08:00
Dan Poltawski
6217bb5b8d Merge branch 'MDL-38359-master' of git://github.com/damyon/moodle 2013-06-11 15:31:20 +08:00
Damyon Wiese
52fdb0582a MDL-38359 assign: Set header field name so it works with shortforms
Two forms were adding headers with empty names - fixed.
2013-06-11 15:25:01 +08:00
Damyon Wiese
e9416eb7ef MDL-37621 assign: Fix php error on create new assign
I removed one too many defaults in the previous patch. This patch
puts back the default for teamsubmissiongroupingid.
2013-06-11 17:13:00 +10:00
Damyon Wiese
bb6471aa88 MDL-38359 assign: Add support for admin defaults for marking workflow settings 2013-06-11 14:26:33 +08:00
Dan Marsden
f8d107b3a8 MDL-38359 Marking Allocation and Workflow code
based on Marking workflow code from Damyon Wiese
2013-06-11 14:11:41 +08:00