a10d621fc5
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
2013-10-21 16:51:33 +11:00
6e72e0a6aa
MDL-31405 assign: avoid uncessary get_string call
2013-10-21 11:02:45 +08:00
57bafe6ebc
Merge branch 'wip-mdl-31405-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
2013-10-21 10:59:00 +08:00
ca4349c1ce
MDL-31405 Assignment: Fixed date in reset to be called once
...
Conflicts:
mod/assign/locallib.php
2013-10-11 08:59:02 +08:00
267b45e0a1
MDL-31405 Assignment reset issue solved
2013-10-11 08:58:29 +08:00
7bd19d562d
Merge branch 'MDL-37153_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE
2013-10-10 12:53:27 +11:00
3e2821e6f5
MDL-37153 - assign: Obey grade display settings in submission status
...
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
2013-10-09 16:03:50 +13:00
6e3013be7c
MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads
2013-09-27 12:45:47 +09:30
43e1ed2cf3
MDL-37804 assign: Return proper notice when submissions closed.
...
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.
Conflicts:
mod/assign/locallib.php
2013-09-12 10:38:45 +08:00
18cbf0db95
Merge branch 'MDL-38267-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-09-11 12:00:15 +08:00
5e99c1f9a1
Merge branch 'MDL-40631-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-09-10 14:32:00 +08:00
4da2fefa4d
Merge branch 'MDL-37804_24' of github.com:recreate/moodle into MOODLE_24_STABLE
2013-09-09 17:13:49 +08:00
4520f30def
MDL-41179 assign: Ensure a submission record exists for lock/unlock
...
Can't change the function params because it is changed in master already.
This will create a draft submission when a student is prevented from submitting
but that is a minor sideeffect and doesn't happen in master.
2013-09-04 11:03:36 +08:00
e8bc65a85e
Merge branch 'MDL-40214_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-09-03 10:07:08 +08:00
30d3f1d220
MDL-38267 assign: No Submit button after cut-off date
...
Conflicts:
mod/assign/locallib.php
mod/assign/tests/locallib_test.php
2013-09-02 22:49:42 +08:00
a7f94caa2e
MDL-40631: Prevent students from submitting empty assignments.
...
Conflicts:
mod/assign/locallib.php
mod/assign/tests/locallib_test.php
2013-09-02 22:02:50 +08:00
ed016dd8fc
Merge branch 'MDL-41149-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-09-02 17:25:46 +08:00
8e4c96c519
MDL-41249 assign: Fix incorrect gradingform restore step
...
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:33:32 +08:00
7e8638914f
MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore.
2013-08-28 10:49:29 +08:00
cd118a23e7
Merge branch 'MDL-41249-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-08-26 13:11:19 +08:00
7064882041
MDL-41149 assign: Group submission updates emailed to wrong person
...
grade_item_update was altering the userid in the submission record
instead of cloning it. This meant only the last member of a group
recieved all notifications meant for other students in the group.
2013-08-25 22:18:36 +08:00
56f24fadd4
MDL-41249 assign: Restore step missing gradingform mapping
...
Thanks to Matthieu Raggett for the report and the solution.
2013-08-25 21:25:49 +08:00
7d6f0b8224
Merge branch 'MDL-34989-24' of git://github.com/damyon/moodle into MDL-34989-24
2013-08-05 10:44:06 +08:00
336f2df35d
MDL-34989 assign: Do not add a param to grading_disabled - cannot be backported.
...
Conflicts:
mod/assign/locallib.php
2013-07-29 10:00:10 +08:00
214dd19aa2
MDL-34989 assign: Allow students to submit when grade is overriden
...
Also inform teachers when grading is disabled due to gradebook lock/override.
Conflicts:
mod/assign/locallib.php
2013-07-29 09:59:43 +08:00
a2de489c3e
Merge branch 'MDL-40195_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE
2013-07-16 13:29:19 +08:00
622425d2fb
MDL-40093 mod/assign: Remove count of drafts in offline assignment's grading summary screen
2013-07-10 11:36:53 +10:00
d79c15550f
MDL-40195: mod_assign: Display grades when quickgrading to 2 decimal places
2013-07-08 20:07:12 +09:30
211c473452
Merge branch 'MDL-39760-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE
...
Conflicts:
mod/assign/locallib.php
2013-06-24 14:29:21 +12:00
bf296d3cf3
MDL-38376 mod_assign: Feedback displayed when Grade set to hidden
2013-06-24 10:19:53 +12:00
478cac84e1
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 15:35:17 +01:00
c07c4324c7
MDL-39760: mod_assign: Make submit_for_grading accept submission as parameter.
2013-06-19 15:35:16 +01:00
79cb5006f9
Merge branch 'MDL-39761-MOODLE_24_STABLE' of https://github.com/lucisgit/moodle into MOODLE_24_STABLE
2013-06-17 14:26:13 +12:00
4802b1ed8e
Merge branch 'MDL-39317-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-06-04 11:26:45 +08:00
0dc499ec7f
Merge branch 'MDL-39743-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-06-04 11:03:55 +08:00
954e384783
Merge branch 'MDL-39487_24' of https://github.com/IOC/moodle into MOODLE_24_STABLE
2013-06-03 19:03:38 +02:00
5f11ce035d
MDL-37804 mod/assign: Students no longer able to submit files after due date with Prevent late submissions turned on.
2013-05-29 13:30:41 -07:00
7bf288a640
MDL-39317 assign: Fix for submitted filter on grading table.
...
Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
2013-05-29 14:50:48 +08:00
24a3f392ba
MDL-39743 assign: Fix missing capability check for "grant extension"
...
Conflicts:
mod/assign/locallib.php
2013-05-29 12:08:40 +08:00
8a06e21c2a
MDL-39761: mod_assign: Always check submission plugin status and visibility.
2013-05-20 16:45:43 +01:00
54061d7cbf
Merge branch 'MDL-36223-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-05-07 15:28:33 +01:00
31dda933e6
Merge branch 'MDL-38315-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-05-06 22:19:55 +08:00
f23877abfb
MDL-38443 Assignment: Missing permissions check on downloadall submissions
2013-05-06 10:20:49 +01:00
2fc7799975
MDL-39487 mod/assign: fixed ID number of grade item changing
2013-05-03 11:08:19 +02:00
4d69adc760
MDL-36223 Assign: User outline report grade display
...
Use str_long_grade for user outline report because it handles scales and
no grade.
Thanks to Jean-Daniel Descoteaux for suggesting this fix.
2013-05-02 15:46:27 +08:00
be9d851c07
Merge branch 'MDL-39422-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE
2013-05-01 11:14:28 +12:00
41b2eb8400
MDL-39422 mod_forms: prevent long coruse module names
...
To prevent ugly DB errors.
2013-04-30 17:42:03 +01:00
6476ff5a7c
Merge branch 'MDL-37966_24' of git://github.com/jonof/moodle into MOODLE_24_STABLE
2013-04-30 12:51:27 +08:00
d9a277684f
Merge branch 'MDL-38361_24' of https://github.com/prateeksachan/moodle into MOODLE_24_STABLE
2013-04-19 15:11:48 +01:00
ea99087d08
MDL-39135 assign_feedback: fix missing renderer argument
...
assign_user_summary expects extra profile fields
Conflicts:
mod/assign/feedback/file/locallib.php
2013-04-17 14:05:31 +08:00
Jody Steele