Commit graph

11185 commits

Author SHA1 Message Date
David Mudrak
a3b37e4b6e MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level 2011-11-11 13:59:04 +01:00
David Mudrak
37065c2e06 MDL-29793 Advanced grading forms attached to activity modules can be restored now 2011-11-08 23:33:40 +01:00
Marina Glancy
8545f86cc9 Fixed small bug in displaying locked outcomes in assignment grade form 2011-11-08 10:34:23 +08:00
Marina Glancy
71380f2f14 MDL-30061: advanced grading evaluation freezes now if grade is locked or overriden 2011-11-08 10:06:33 +08:00
Marina Glancy
13926e735d MDL-30159: fixed bug: When evaluating by advanced grading extra entries are inserted in grading_instances 2011-11-07 14:37:58 +08:00
Marina Glancy
0136124e21 MDL-30112: marking rubric filling instances for regrading
- If a used rubric being updated, teacher (moderator) is notified
- If the changes are significant, all instances automatically marked for regrade
- if the changes are minor (texts, options or sortorder), teacher can choose whether to mark for regrade or not
- The instances marked for regrade can be re-graded but students are not able to see the rubric
- when grading a message appears if the instance is marked for regrade and is not visible to students
2011-11-03 16:08:36 +08:00
David Mudrak
d6d341d09b Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-11-02 23:17:08 +01:00
David Mudrak
9e4eb676e4 MDL-29483 The list of gradable areas is now obtained from the module
At the moment, only activity modules are supported.
2011-11-02 22:25:32 +01:00
Eloy Lafuente (stronk7)
799be36820 MDL-29213 - add clarification note + todo once MDL-30039 arrives 2011-11-02 19:07:52 +01:00
David Mudrak
ce7f5c8d3b Merge pull request #20 from marinaglancy/wip-nov02-rubric 2011-11-02 03:41:12 -07:00
Marina Glancy
63b9a6d07d MDL-29920: grade.php in assignment now can show submission/feedback for a particular user (also when submission did not exist yet) 2011-11-02 11:13:14 +01:00
Marina Glancy
0e2a1d755a MDL-29482: error message is displayed to graders if grading form is unavailable 2011-11-02 11:12:02 +08:00
Marina Glancy
156d6f4876 MDL-29920: now complete report properly calls view_feedback in assignment 2011-11-02 09:04:01 +08:00
Dan Marsden
a5ba44f93c MDL-29213 - fix for bug with flash player and IE 9
(cherry-picked and amended with 1-line whitespace)
2011-11-01 19:59:05 +01:00
Eloy Lafuente (stronk7)
302f45e8de Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle 2011-11-01 12:26:31 +01:00
Aparup Banerjee
ddba89cc2a Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-11-01 15:18:44 +08:00
Petr Skoda
0775152ff0 MDL-30005 regression fix for non http/ftp urls 2011-11-01 07:56:33 +01:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
Tim Hunt
a49e92a4e9 MDL-29164 question import, missing lang string.
AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END
2011-10-31 15:35:07 +00:00
Aparup Banerjee
c84f4700ec Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle 2011-10-31 17:08:32 +08:00
Aparup Banerjee
b2851c8ded MDL-30005 URL : fixed typos 2011-10-31 15:12:45 +08:00
Aparup Banerjee
2636126f89 Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-10-31 14:13:46 +08:00
Sam Hemelryk
243e3dd130 Merge branch 'MDL-29810' of git://github.com/bostelm/moodle 2011-10-31 17:11:08 +13:00
Sam Hemelryk
70f43a4789 Merge branch 'MDL-29993' of git://github.com/stronk7/moodle 2011-10-31 15:19:31 +13:00
Sam Hemelryk
01dc193786 Merge branch 'MDL-29992' of git://github.com/stronk7/moodle 2011-10-31 14:56:06 +13:00
Sam Hemelryk
cdf30a11a8 Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle 2011-10-31 13:06:10 +13:00
Sam Hemelryk
81ad059658 Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle 2011-10-31 12:59:35 +13:00
Sam Hemelryk
75dab90e3d Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle 2011-10-31 12:55:57 +13:00
Sam Hemelryk
ad7592f32b Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle 2011-10-31 12:47:21 +13:00
Petr Skoda
b615a0bf9a MDL-30005 bump up version after lang string change 2011-10-30 23:53:26 +01:00
Petr Skoda
48f69e418c MDL-30005 fix general URI support in URL module
The recent change completely removed support for general URIs and enforced strict URL validation which was breaking backwards compatibility and was not user friendly at all.

This patch finally adds full URI support with basic validation and fixes some older xhtml strict issues.

Please note we do not try to explain the difference between URL and URI to our users. Also keep in mind that mod/url has XSS risk and does not do any security validation of the data.
2011-10-30 23:53:17 +01:00
Dan Marsden
503dfba895 SCORM MDL-30009 fix issue with started on/last accessed when iterating through users. 2011-10-31 11:04:20 +13:00
David Mudrak
8df95cf7f4 MDL-30006 Workshop / Number of errors grading: force graders to actually answer the form
QuickForms do not distinguish non-checked radio from the checked radio
with the value "0". So we map the database grade value "0" to a value
"-1" when displaying the form and vice versa when saving the form. This
allowed us to have none radios checked by default and force the grader
to actually answer the form themselves, using the 'required' rule.
2011-10-30 20:17:54 +01:00
David Mudrak
60a3e801f3 MDL-30006 Workshop / Accumulative grading: force graders to actually pick a grade
This patch introduces a new hidden field with the value "-1". The grade
selectors are compared with this values and must be greater than it.
This should fit well for numerical grades with the range 0..x and scale
items with the range 1..x.
2011-10-30 20:17:50 +01:00
Eloy Lafuente (stronk7)
350f973d38 MDL-29993 filters - new filter/data filter replacement for legacy mod/data/filter. 2011-10-30 02:33:11 +02:00
Eloy Lafuente (stronk7)
9ff8c803be MDL-29992 filters - move related css from mod/glossary to filter/glossary 2011-10-29 19:02:22 +02:00
Eloy Lafuente (stronk7)
d307a1a70d MDL-29992 filters - move js popup from mod/glossary to filter/glossary
This commit moves the js popup to the new location of the filter. Also
it fixes one bug, with the js processing also glossary category links
leading to error, so now the categories are working again.
2011-10-29 19:02:07 +02:00
Eloy Lafuente (stronk7)
85a69ce123 MDL-29992 filters - new filter/glossary filter replacement for legacy mod/glossary/filter. 2011-10-29 17:50:58 +02:00
Petr Skoda
1344b0ca7f MDL-29982 improve can_access_course()
Hopefully faster and more accurate.
2011-10-29 09:45:54 +02:00
Dan Marsden
61c347cc73 SCORM MDL-29965 improve display of SCORM package - decrease unecessary padding 2011-10-29 15:28:09 +13:00
Petr Skoda
2dc54611f2 MDL-29921 remove unmaintained qti_two export question type
It can be easily included in official distribution again if somebody fixes it because there are no stored data, capabilities or versions. This will finally allow us to drop the outdate Smarty library form distribution package.
2011-10-28 10:32:24 +02:00
Andreas Grabs
9c5bc7a580 MDL-29804 - Clean up Feedback modules coding style 2011-10-28 00:30:42 +02:00
Henning Bostelmann
4ac9f47051 MDL-29810 Assignment grading: don't include teachers in list of students 2011-10-27 22:16:03 +01:00
David Mudrak
18dd4a69d0 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-27 21:58:45 +02:00
Aparup Banerjee
a0b10b271f Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle 2011-10-26 11:23:09 +08:00
Dan Marsden
da69510f2a MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist 2011-10-26 10:59:13 +13:00
Sam Hemelryk
e6369d951c Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle 2011-10-26 10:44:41 +13:00
Stephen Bourget
d31a1ad808 MDL-29368 Assignment: Fixed a fatal error caused by a missing include 2011-10-25 19:19:02 +02:00
Tim Hunt
bed495578f MDL-29854 questions: display better message and more useful continue
when an error occurs in the middle of processing responeses.
2011-10-25 14:49:57 +01:00
Rossiani Wijaya
b43251b846 MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty 2011-10-25 12:22:02 +08:00