Andrew Davis (andyjdavis)
c87d90be14
MDL-6397 database: removed an unused string
2011-08-25 08:29:32 +08:00
Eloy Lafuente (stronk7)
0a4ca115b2
Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
2011-08-24 14:06:22 +02:00
Eloy Lafuente (stronk7)
2ed28439f6
Merge branch 'MDL-28976' of git://github.com/timhunt/moodle
2011-08-24 12:57:16 +02:00
Eloy Lafuente (stronk7)
c8f74cc628
Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle
2011-08-24 00:52:56 +02:00
Aparup Banerjee
553d343bf2
Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle
2011-08-24 03:03:50 +08:00
Eloy Lafuente (stronk7)
379771a723
Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
2011-08-23 19:04:44 +02:00
Eloy Lafuente (stronk7)
4abd7a07e1
Merge branch 'MDL-28996' of git://github.com/timhunt/moodle
2011-08-23 10:41:17 +02:00
Eloy Lafuente (stronk7)
c946644435
Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle
2011-08-23 02:49:40 +02:00
Petr Skoda
11ec4ed51d
MDL-28981 fix forum_user_can_post() call params
2011-08-21 15:50:23 +02:00
Petr Skoda
1c8c6c34fd
MDL-28982 fix DML use
2011-08-21 15:38:46 +02:00
Petr Skoda
21aa9d48e3
MDL-26796 document array parameter changes
2011-08-19 17:04:34 +02:00
Ankit Kumar Agarwal
784967eab8
MDL-27624 SCORM formating codes
2011-08-19 11:17:19 +12:00
Ankit Kumar Agarwal
266a129c14
MDL-27624 Small structural changes
...
MDL-27624 SCORM adding definition to scrom elements
modified: mod/scorm/lang/en/scorm.php
modified: mod/scorm/userreport.php
2011-08-19 11:17:19 +12:00
Dan Marsden
3b71ce6a5c
MDL-28999 SCORM add missing yui2 require
2011-08-19 10:23:46 +12:00
Tim Hunt
a47a46f136
MDL-28996 Quiz view page list of attempts table is sometimes missing a cell.
2011-08-18 19:26:30 +01:00
Tim Hunt
45e5fbe11e
MDL-28976 quiz was passing 0 to ->attempt_url when it should have been null.
...
There was also one other incorrect call that is fixed in this commit.
2011-08-18 14:00:30 +01:00
Tim Hunt
13bbfebc75
MDL-28226 quiz locallib. Fix PHPdoc comment and code to make the API clearer.
2011-08-18 13:58:14 +01:00
Petr Skoda
18bd7573d6
MDL-26796 convert array parameter cleaning to new functions
2011-08-18 08:40:33 +02:00
Eloy Lafuente (stronk7)
f5cf69047d
Merge branch 'MDL27951' of git://github.com/ankitagarwal/moodle
2011-08-17 03:09:15 +02:00
Eloy Lafuente (stronk7)
c2f4948cab
Merge branch 'wip-mdl-27219' of git://github.com/rajeshtaneja/moodle
2011-08-17 02:58:40 +02:00
Eloy Lafuente (stronk7)
eed08a1c25
Revert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"
...
This reverts commit 7441c53cc1
2011-08-17 02:27:50 +02:00
Eloy Lafuente (stronk7)
e1314fe345
Merge branch 'MDL-21934' of git://github.com/timhunt/moodle
2011-08-17 01:28:41 +02:00
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
