Eloy Lafuente (stronk7)
b59545e6e5
Merge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle
2011-08-17 00:32:23 +02:00
Eloy Lafuente (stronk7)
6d4f437640
Merge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle
2011-08-16 23:42:59 +02:00
Eloy Lafuente (stronk7)
78fe1bad47
Merge branch 'MDL-28365' of git://github.com/timhunt/moodle
2011-08-16 13:03:02 +02:00
Rajesh Taneja
d0157d827b
MDL-27219 chat: Beep will not display user fullname if user is not in chat
2011-08-16 16:34:16 +08:00
Eloy Lafuente (stronk7)
6ae8a01edb
Merge branch 'master_MDL-28739' of git://github.com/danmarsden/moodle
2011-08-16 03:02:29 +02:00
Eloy Lafuente (stronk7)
f716839a3f
Merge branch 'MDL-27030' of git://github.com/timhunt/moodle
2011-08-16 02:06:07 +02:00
Eloy Lafuente (stronk7)
f50675809f
Merge branch 'wip-mdl-27896' of git://github.com/rajeshtaneja/moodle
2011-08-16 01:55:30 +02:00
Eloy Lafuente (stronk7)
70fc3fb919
Merge branch 'master_MDL-28937' of git://github.com/danmarsden/moodle
2011-08-16 01:52:59 +02:00
Eloy Lafuente (stronk7)
485b56ee87
Merge branch 'master_MDL-28933' of git://github.com/danmarsden/moodle
...
Conflicts:
mod/scorm/api.php
2011-08-16 01:40:06 +02:00
Eloy Lafuente (stronk7)
21507599b1
Merge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle
2011-08-16 01:26:34 +02:00
Eloy Lafuente (stronk7)
c380fbf4c9
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
2011-08-16 00:37:23 +02:00
Tim Hunt
effc982b1e
MDL-21934 Removing all questions from the quiz should not delet overall feedback.
...
Overall feedback was being wiped because the quiz max grade was being set to zero when sumgrades was set to 0. The correct logic is to only set maxgrade to 0 if there are questions in the quiz and sumgrades is 0.
2011-08-15 18:47:03 +01:00
Tim Hunt
a41c441c05
MDL-28365 Move question lang string to the right file
...
All the references to this sring were already referring to it in the new
place.
AMOS BEGIN
MOV [cannotread,mod_quiz],[cannotread,question]
AMOS END
2011-08-15 15:18:21 +01:00
Dan Marsden
6917eee804
MDL-28937 SCORM 2004 ADL TEST CM-01 MDL-28740 first part of check for hidecontinue param in SCO - prevent next item in TOC from being selectable and disable buttons in navbar if links don't exist in TOC
2011-08-15 18:33:33 +12:00
Dan Marsden
e6402b54ad
MDL-28933 SCORM use a global function to check SCORM version to make sure all methods of storing SCORM version are checked.
2011-08-15 14:05:59 +12:00
Mayank Gupa
05c2b851c0
MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null
2011-08-15 13:47:40 +12:00
Mayank Gupa
6faea458ba
MDL-28541 SCORM ADL TEST CM-01 MDL-28740 fixing cmi.scaled_passing_score returning null
2011-08-15 10:26:18 +12:00
Dan Marsden
45999e7895
MDL-28739 SCORM trim minnormalizedmeasure before saving it
2011-08-13 19:03:53 +12:00
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
