271bfb48b8
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 17:43:21 +08:00
6a1bcbfdab
MDL-36263 Assignment: Fix backport for counting submissions of unenrolled students
2012-12-13 17:41:17 +08:00
18a0b829a4
MDL-36644 Assignment: prepend the course upload limit to the options array
...
Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
2012-12-12 08:57:21 +08:00
f2190bac6c
Merge branch 'MDL-36712-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 14:01:14 +08:00
1ff0a314c9
Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 13:57:11 +08:00
237ea8768c
Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-12-11 15:44:32 +13:00
b2fa6cfa93
Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:39:42 +08:00
3c805e592c
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:10:07 +13:00
ae4e512f66
Merge branch 'MDL-36167-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-10 17:32:30 +08:00
66586db224
Merge branch 'MDL-36835-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-10 14:02:24 +08:00
40c1230f1f
MDL-36263 Assignment: Do not count submissions of unenrolled users
2012-11-30 15:36:11 +08:00
46c678ab33
MDL-36908 Assignment: Additional fixes for preventing empty submissions
...
Conflicts:
mod/assign/assignmentplugin.php
mod/assign/locallib.php
mod/assign/renderer.php
2012-11-30 12:46:25 +08:00
4f6e4a5b75
MDL-36835 Assignment: Do not show javascript warning when toggling quickgrading
2012-11-30 10:05:40 +08:00
16d31e2376
MDL-36914: Assignment upgrade. Clean up patch to include outcomes in the upgrade
...
Thanks to Nathan Mares for reporting this issue.
2012-11-29 16:11:04 +08:00
fb9c26d092
MDL-36914: Re-associate all grade_item records when upgrading assignments to prevent data loss
2012-11-29 16:11:03 +08:00
e8dd799570
MDL-36905 accessibility for assignment grading: add label for grading actions and operations select options
2012-11-29 15:11:34 +08:00
a38a5cefb3
Merge branch 'MDL-35966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-28 14:15:41 +08:00
8abd89f17e
MDL-36591 Assignment - rewrite image urls in online text summaries
2012-11-28 10:19:47 +08:00
4254a7495c
Merge branch 'MDL-36012-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-28 11:12:30 +13:00
2dd7131e1e
MDL-35966 Assignment - Localisation issue - use userdate not strftime
...
This is causing a database error (reported on MySQL) when strftime returns
non-utf8 characters. This occurs when sending assignment notifications.
This was reported and a solution provided by Chien Wen-Chang(簡文章).
2012-11-27 16:18:15 +08:00
89ac5e8782
Merge branch 'MDL-36184-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-11-27 13:58:29 +08:00
42e0a59d5b
MDL-34052 assignment - Disable submission and feedback plugins based on assign type when upgrading
2012-11-27 13:39:53 +08:00
dba42c3390
MDL-36712: Assignment grading with custom scale is affected by the current language
2012-11-21 15:35:44 +08:00
85b5e20cde
MDL-35963: Assignment - do not accept empty submissions
...
Conflicts:
mod/assign/locallib.php
2012-11-21 13:53:34 +08:00
80238a3cc2
MDL-36012: Assignment, Accessibility - Add user information to alt text for grade icon in grading table.
...
Conflicts:
mod/assign/lang/en/assign.php
2012-11-21 12:03:45 +08:00
19d964e07a
Merge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
2012-11-21 12:01:03 +08:00
fbd336f810
MDL-36184: Assignment quickgrading should only update lastmodified dates for modified submissions
2012-11-21 11:14:29 +08:00
7cc7277064
MDL-36167: Assignment quickgrading fix when there is no grade (ensure feedback still saves)
...
This patch modifies the previous on by Luke Tucker so that the lastmodified hidden field
is always added to the quickgrading form even if there is no grade for the assignment. This
ensures that the lastmodified checks still work (to prevent teachers overwriting each
others feedback) and feedback is saved when there is no grade.
Conflicts:
mod/assign/locallib.php
2012-11-21 09:33:14 +08:00
9e494233b0
MDL-36167: Update all users in assignment quickgrade form to ensure feedback is saved
2012-11-21 09:31:20 +08:00
62d70e07bc
MDL-36655: Assignment - do not add empty group to grading form when there is only one student
2012-11-16 11:00:05 +08:00
dc99b426e9
MDL-36509: Assignment grading table rownum offset is wrong by one.
2012-11-13 09:59:11 +08:00
282183647b
Merge branch 'MDL-36051_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
2012-11-08 15:10:06 +08:00
3bcff38015
MDL-36051 - Quick Grading in Assignment module does not turn on in some circumstances
...
* Fixed bug with quick grading when file submission is turned off
2012-11-07 16:28:02 -08:00
a5b62b8f31
MDL-35249 - Move Grading popmenu "userid" column after "scale" column (workaround)
...
Conflicts:
mod/assign/gradingtable.php
2012-11-08 11:00:49 +13:00
93efeb5352
MDL-36130: mod_assign: migrate logs when migrating from mod_assignment
2012-10-31 14:52:47 +08:00
5f845b3e66
MDL-36289: Assignment - Prevent feedback files being copied to the next user when using "Save and next".
...
Conflicts:
mod/assign/feedback/file/locallib.php
2012-10-31 10:37:42 +08:00
0e8aa5027e
MDL-35726: Use a different form identifier for each form when using "Save and next"
...
This prevents a bug where the next student feedback will default to the values that
were on the last submitted form. This is a similar case to having multiple instances
of the same form on the same page - each one needs a unique identifier to distinguish
between them. In this case I include the $rownum which changes as you go to each student
in the list.
2012-10-12 12:07:19 +08:00
859d840627
Merge branch 'MDL-34794_M23' of git://github.com/raymondAntonio/moodle into MOODLE_23_STABLE
2012-10-09 00:08:26 +02:00
36c7b8665f
MDL-35763: Add ignoredirty class to drop down lists in assignment grading options form.
2012-10-03 11:57:25 +08:00
10839ace75
MDL-34794_M23: Add reset course feature in mod_assign (new assignment)
2012-09-28 16:25:55 +08:00
b865c07b69
MDL-35665: Cherry-pick MDL-35389 : Fix an error when changing locked state of a assignment is changed
2012-09-28 12:30:30 +08:00
ff61f14c04
MDL-35252: Fix a bug that creates unneccessary rows in grade_grades table when unchecking 'overridden' check box in gradebook update
2012-09-25 12:19:07 +08:00
125759ddf4
Merge branch 'MDL-35202-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
2012-09-25 11:43:05 +08:00
b666bddae2
MDL-35375: Ensure the assignment grading table is always sorted by at least one unique column
...
Conflicts:
mod/assign/gradingtable.php
2012-09-24 12:38:24 +08:00
91cb7bdab5
Merge branch 'MDL-35398-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
2012-09-24 15:03:26 +12:00
2b7024847d
MDL-35427: Remove resetting of $_POST - use $mform->setConstant to force update to rownum instead.
...
Conflicts:
mod/assign/locallib.php
2012-09-24 15:02:17 +12:00
ce86eb4d08
MDL-35202: Allow for language files that contain non-ascii for actions in assignment
2012-09-18 15:27:58 +08:00
97b53d6c05
MDL-35398: Quick grading feedback is now pushed to the gradebook
2012-09-18 14:54:01 +08:00
1077bf7086
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:57:26 -04:00
cb3a1e355b
Merge branch 'm23_MDL-35255' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2012-09-11 12:10:55 +12:00
Dan Poltawski