mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-01 06:22:35 +02:00
Code Issues Projects Releases Wiki Activity
69,840 Commits 36 Branches 527 Tags
Commit Graph

1015 Commits

Author SHA1 Message Date
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Dan Poltawski
79cf14b327 MDL-47378 mod_assign: prevent debugging notice 
Parameters come out of get_user_preferences as strings.
 2014-09-24 15:41:04 +01:00
Pavel Sokolov
5ae56c6e44 MDL-37707 mod_assign: Prevent user from switching to and from team submissions 2014-09-24 16:07:01 +08:00
Dan Poltawski
ffd24d9a61 Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle 2014-09-15 11:08:24 +01:00
Marina Glancy
5b460d65cc MDL-47187 assign: fixed timing unittest failure 2014-09-10 11:58:00 +08:00
Marina Glancy
7fde166775 Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle 2014-09-08 12:57:34 +08:00
Eloy Lafuente (stronk7)
9bdb64681f Merge branch 'MDL-39929' of https://github.com/bostelm/moodle 2014-09-03 00:13:53 +02:00
sam marshall
c13ac85db8 MDL-44725 Availability: Replace groupmembersonly - assign (10) 
Updated code to restrict list of users. Also includes changes to
ensure that a cm_info object is available (required for availability
checks).

There is a tweak to upgradelib to reflect the different fields used.
(Note that upgradelib is not used during upgrade, but only when
converting assignments from the old assignment module.)
 2014-09-02 13:03:27 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6) 
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
 2014-09-02 13:03:17 +01:00
Henning Bostelmann
7faf78cbae MDL-39929 Assignment: provide file upload area for assignment description 2014-09-02 11:02:16 +01:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00
Jon Marthaler
abd0f0aec6 MDL-46539 assign calendar: Fix lastcron value for assign cron 2014-08-27 11:17:28 -05:00
Damyon Wiese
ab38cb2833 MDL-46842 assign: Fix for unit tests - previous patch was completely ignoring manually reopening attempts. 2014-08-26 10:30:14 +08:00
Eloy Lafuente (stronk7)
863c536219 Merge branch 'master_MDL-46842' of https://github.com/greg-or/moodle-mod_assign 2014-08-26 01:58:08 +02:00
Eloy Lafuente (stronk7)
40f1dff05f Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle 2014-08-26 00:09:51 +02:00
Marina Glancy
e55cecf05f Merge branch 'MDL46887_assignment_file_max_size' of git://github.com/Dave-B/moodle 2014-08-25 16:28:49 +08:00
Dan Marsden
f4774f44d1 MDL-46816 mod_asssign plagiarism: Remove unnecessary code. 2014-08-22 09:43:48 +12:00
Damyon Wiese
720d22404b MDL-44304 assignfeedback_editpdf: Fix fatal error when viewing team assignments with editpdf responses. 2014-08-21 12:09:27 +08:00
Damyon Wiese
506df250af MDL-44304 assignfeedback_editpdf: Behat test for group submissions 2014-08-21 12:09:22 +08:00
Gregory Faller
767fda9bce MDL-46842: Reopen assignment submissions when using offline grading worksheet 2014-08-20 19:13:49 +09:30
David Balch
6ba716c118 MDL-46887 mod_assign: Enforce module's maxbytes setting at submission. 2014-08-19 13:29:15 +01:00
Dan Poltawski
62e30bfbcd Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign 2014-08-12 11:02:18 +01:00
Dan Poltawski
d3014cca39 Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 14:31:02 +01:00
Gregory Faller
cfdd3e5cac MDL-46718: Return user to last accessed page when quick grading 2014-08-08 14:01:02 +09:30
Gregory Faller
ce09177696 MDL-44015: EditPDF scrolls instead of drawing on iOS 2014-08-06 14:45:43 +09:30
Damyon Wiese
0672e056dc MDL-44149 Assign: Reopen attempts from quick grading (reopenuntilpass) 2014-08-04 15:52:53 +08:00
Sam Hemelryk
6df4025b2c Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle 2014-07-29 15:50:50 +12:00
Dan Poltawski
d4a89aa500 Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle 2014-07-28 12:47:30 +01:00
Sam Hemelryk
db28260c29 Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle 2014-07-28 08:46:03 +12:00
Damyon Wiese
cbec30d4de MDL-46485 Assign: Fix when submitting to a group assignment from the default group 2014-07-25 15:18:40 +08:00
Damyon Wiese
e2d2d8a175 MDL-46485 Assign: New unit test to show error with group submission 2014-07-25 15:18:34 +08:00
Tony Butler
f33be9eb36 MDL-43908 mod_assign: Order submissions by course id then cm id 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 17:20:19 +01:00
Tony Butler
86dced433e MDL-43908 mod_assign: Remove redundant code and improve SQL query 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 17:20:19 +01:00
Tony Butler
c681f7a083 MDL-43908 mod_assign: Prevent notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 16:59:24 +01:00
Tony Butler
ccd6839a7b MDL-43908 mod_assign: Defer notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-24 16:59:24 +01:00
Damyon Wiese
9f65f9c332 MDL-46506 Assign: fix php warning on grant extension page 
This code was missed when the extensionduedate was moved to the userflags table.
 2014-07-24 11:25:22 +08:00
Damyon Wiese
3169bb36aa MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup 2014-07-24 10:50:20 +08:00
Dan Poltawski
1911cf3c99 Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle 2014-07-23 08:24:24 +01:00
Dan Marsden
5a96486b44 MDL-45715 assign: disable marking allocation if markingworkflow is not set. 2014-07-23 19:15:09 +12:00
Dan Poltawski
919dc292b9 MDL-45965 assign: bump version 2014-07-22 17:23:45 +01:00
Dan Poltawski
406e47123d Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle 2014-07-22 17:09:48 +01:00
Dan Poltawski
02213adfd0 Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle 2014-07-22 15:56:55 +01:00
Damyon Wiese
2fef6e7060 MDL-46017 Assign: Fix restore of marking workflow data 2014-07-21 16:35:30 +08:00
Damyon Wiese
ae7638f72a MDL-37509 Assign: Do not put description in calendar before it should be shown to students 2014-07-21 15:54:39 +08:00
Damyon Wiese
3b775a0b8a MDL-43151 Assign: More validation in mod_form. 
Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on
 2014-07-21 13:41:51 +08:00
Damyon Wiese
3db661cdae MDL-43151 assign: Use grade_grade->is_passed 
Do not try and calculate this inside mod_assign - it's a gradebook thing only.
 2014-07-21 13:22:22 +08:00
Sam Hemelryk
424033b780 Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle 2014-07-21 11:32:09 +12:00
David Balch
d9bfe3c5c1 MDL-40479 mod_assign PHPDoc: Fix error, improve consistency. 2014-07-16 08:58:21 +01:00
David Balch
153510ead8 MDL-40479 mod_assign: Fix the colour of grading success messages. 2014-07-16 08:57:48 +01:00