Commit graph

11545 commits

Author SHA1 Message Date
Dan Marsden
7441c53cc1 MDL-25757 SCORM fix issue with duplicate cmi values being saved 2011-08-13 13:22:58 +12:00
Ankit Kumar Agarwal
59666dae0e MDL-27951 Balancing Div tags 2011-08-12 10:59:35 +05:30
Dan Marsden
f35b5884be MDL-28603 - fix regression for SCORM 1.2 test 2011-08-12 17:15:18 +12:00
Rajesh Taneja
e9de1cf49c MDL-27896 context - Fixed editor context to observe filter status 2011-08-12 11:33:21 +08:00
Dan Marsden
666efc149a MDL-28649 SCORM fix force new attempt when skipview is used 2011-08-12 12:44:16 +12:00
Dan Marsden
93e46331fc MDL-28721 SCORM - respect hide navigation buttons setting. 2011-08-12 11:06:58 +12:00
Eloy Lafuente (stronk7)
76f063fa5d Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle 2011-08-10 23:03:06 +02:00
Eloy Lafuente (stronk7)
89c6def316 Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle 2011-08-10 22:46:42 +02:00
sam marshall
05b7cd7ae9 MDL-27491 Add 'complete on view' support to wiki, survey 2011-08-10 10:56:14 +01:00
Sam Hemelryk
92636dfb5a Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle 2011-08-10 14:04:22 +08:00
Eloy Lafuente (stronk7)
09e35896d4 Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle 2011-08-10 03:00:17 +02:00
Eloy Lafuente (stronk7)
7e988ed160 Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle 2011-08-10 02:47:57 +02:00
Dan Marsden
6d954dd372 MDL-28295 SCORM change mangement of pop-up windows, load full SCORM API in existing window - this fixes an issue with IE 7 and httpreq communication 2011-08-10 12:19:49 +12:00
Eloy Lafuente (stronk7)
1c001177ea Merge branch 'MDL-28604' of git://github.com/timhunt/moodle 2011-08-09 09:41:53 +02:00
Tony Levi
88b3eb8bb5 MDL-27030: Fix quiz overview report showing incorrect grades on regraded attempts
Conflicts:

	mod/quiz/report/overview/report.php
2011-08-08 23:34:54 +01:00
Eloy Lafuente (stronk7)
1cdb96319d MDL-28493 scorm - fix whitespace 2011-08-08 18:15:42 +02:00
Petr Skoda
ca39e6d2fd Merge branch 'master_MDL-28601' 2011-08-08 16:18:08 +02:00
Petr Skoda
260cf4c2fd Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle 2011-08-08 15:32:29 +02:00
Sam Hemelryk
01352e33cc Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle 2011-08-08 15:05:56 +08:00
Sam Hemelryk
16c009c5bf Merge branch 'MDL-28602' of git://github.com/timhunt/moodle 2011-08-08 11:06:54 +08:00
Sam Hemelryk
067b8a5556 Merge branch 'MDL-28593' of git://github.com/timhunt/moodle 2011-08-08 11:04:19 +08:00
James Brisland
a8b2690bff MDL-28620 - Removed admin/generator.php include as it causes issues if this script is included from any other script that is running in the command line 2011-08-05 16:09:30 +01:00
M Kassaei
92e6e128ff MDL-27631 question bank Show question text in the question list when top level category is used 2011-08-05 10:40:06 +01:00
Tim Hunt
609c0d6b9a MDL-28593 Missing include breaks editing quiz grade item. 2011-08-05 08:50:08 +01:00
Tim Hunt
e5b0920e48 MDL-28612 Quiz statistics report does not always show the 'Actual response' column when it should 2011-08-04 18:14:31 +01:00
Tim Hunt
b2817f8057 MDL-28602 Quiz review reports the wrong duration. 2011-08-04 14:11:32 +01:00
Tim Hunt
b72b413759 MDL-28604 Question bank display forgets sort order 2011-08-04 13:53:02 +01:00
Dan Marsden
02c1f7e253 MDL-28601 SCORM remove old js not used since MDL-22951 2011-08-05 00:41:09 +12:00
Dan Marsden
03c3488957 MDL-28311 SCORM tidy up php warnings and display warning message to teacher that their manifest is invalid 2011-08-04 11:08:42 +12:00
Petr Skoda
92f97e8253 Merge branch 'master_MDL-28493' 2011-08-03 08:27:52 +02:00
Dan Marsden
894dbd0420 MDL-28493 - fix version in upgrade - thanks Andrew 2011-08-03 15:36:52 +12:00
David Mudrak
6403358838 MDL-27550 workshop: fixed XHTML strictness of H3 and A combo
H3 is block level element while A is in-line element in XHTML.
Credit goes to Sam Hemelryk for spotting this during the peer-review.
2011-08-02 23:34:04 +02:00
David Mudrak
2c75324ee6 MDL-27550 workshop: rendering links to the submission and the assessment page
This usability improvement helps to provide feedback quickly during the
grading evaluation phase.
2011-08-02 23:33:33 +02:00
David Mudrak
3779dcae98 MDL-27550 workshop: students do not see peer-assessment that are not graded yet 2011-08-02 23:33:32 +02:00
David Mudrak
f68648e982 MDL-27550 workshop: display the feedback for the submission reviewer when the workshop is closed 2011-08-02 23:33:32 +02:00
David Mudrak
38504a4490 MDL-27550 workshop: assessments are now displayed via proper rendering subsystem
AMOS BEGIN
 MOV [assessmentbyknown,mod_workshop],[assessmentbyfullname,mod_workshop]
AMOS END
2011-08-02 23:33:32 +02:00
David Mudrak
0dfb4bad56 MDL-27550 workshop: display the feedback for the submission author when the workshop is closed
The method user_picture::fields() was not available when these SQL
statements were originally written. Now instead of hard-coding the list
of returned fields, the user_picture is asked for the list.

Together with this change, methods workshop::get_submission_by_id()
and workshop::get_submission_by_author() now return the information
about the user who provided the feedback and overwrote the grade.
2011-08-02 23:33:32 +02:00
Petr Skoda
1f5be6fbcd Merge branch 'master_MDL-10707' 2011-08-02 15:59:42 +02:00
Petr Skoda
58f9006970 Merge branch 'MDL-28338' of git://github.com/timhunt/moodle 2011-08-02 15:08:05 +02:00
Petr Skoda
411b2e1d8d Merge branch 'master_MDL-28410' 2011-08-02 15:01:15 +02:00
Petr Skoda
48fa0c75b5 Merge branch 'MDL-28507' of git://github.com/timhunt/moodle 2011-08-02 14:50:41 +02:00
Petr Skoda
82b8e88418 Merge branch 'master_MDL-28535' 2011-08-02 14:35:21 +02:00
Petr Skoda
c03b42f521 Merge branch 'master_MDL-28542' 2011-08-02 14:30:20 +02:00
Tim Hunt
35ddcfb854 MDL-28507 fix bad lang string uses, and remove two obsolete strings. 2011-08-02 13:13:01 +01:00
Sam Hemelryk
44506b87dc Merge branch 'MDL-28490' of git://github.com/timhunt/moodle 2011-08-02 17:55:21 +08:00
Sam Hemelryk
87573744e6 Merge branch 'MDL-28051' of git://github.com/timhunt/moodle 2011-08-02 17:14:04 +08:00
Sam Hemelryk
5867cf5047 Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle 2011-08-02 14:08:31 +08:00
unknown
16321a2bef Merge branch 'master_MDL-27876' of git://github.com/danmarsden/moodle 2011-08-02 13:25:44 +08:00
Piers Harding
9597f85d44 MDL-27876 SCORM auto-adjust the stage height 2011-08-02 17:12:39 +12:00
Dan Marsden
4201a7464a MDL-28542 SCORM tidy up code. 2011-08-02 17:00:01 +12:00