Commit graph

1177 commits

Author SHA1 Message Date
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)
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
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
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)
89c6def316 Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle 2011-08-10 22:46:42 +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)
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
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
Petr Skoda
1f5be6fbcd Merge branch 'master_MDL-10707' 2011-08-02 15:59:42 +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
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
Mayank Gupa
07dbbdde39 MDL-10707 SCORM Fixing cmi.max_time_allowed returned null 2011-08-01 11:08:24 +12:00
Dan Marsden
aab23f98cd MDL-28542 SCORM Course format should use skipview setting. 2011-07-31 18:51:39 +12:00
Mayank Gupa
45075df124 MDL-28493 SCORM Changed objectiveid field to char 2011-07-31 17:13:03 +12:00
Dan Marsden
04c99f8cdf MDL-28535 SCORM remove old IE 6 related warning about zlib 2011-07-30 10:38:55 +12:00
Petr Skoda
99e8656170 MDL-28441 add scormreport_basic to the list of standard plugins 2011-07-23 13:04:23 +02:00
Petr Skoda
5e85f7b50b MDL-27523 fix phpdocs packages 2011-07-18 16:03:15 +02:00
Petr Skoda
d6a1c91bee Merge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle 2011-07-18 15:58:59 +02:00
Sam Hemelryk
5f65d37cd2 Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git 2011-07-19 00:25:13 +10:00
Ankit Kumar Agarwal
4942a84bd6 MDL-27523 Fixing get_string issues 2011-07-15 09:27:02 +12:00
Dan Marsden
99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden
7b6f5c8d1e MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch 2011-07-14 11:01:16 +12:00
Ankit Kumar Agarwal
219f919c24 MDL-27523 Small Fixes 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
f8f34f823d MDL-27523 Minor Edits 2011-07-14 10:57:29 +12:00
Dan Marsden
5e3014df9e MDL-27523 tidy up links to download files, shift logic for set_page to allow mode to be set correctly 2011-07-14 10:57:29 +12:00
Dan Marsden
b2614417a5 MDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin is installed, move delete attempts code into plugin as it may not be supported in all plugins, general tidy up - good work Ankit! 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
62b82cbcff MDL27522 First version Push
modified:   mod/scorm/report.php
	new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
	modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
	new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

	deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
	new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/basic/version.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
	modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php

	modified:   mod/scorm/db/install.xml
	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php
2011-07-14 10:57:29 +12:00
Eloy Lafuente (stronk7)
dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
2011-07-12 16:28:36 +02:00
Dan Marsden
59cdcb9770 MDL-28017 - SCORM unset old config var 2011-07-12 09:46:23 +12:00
Eloy Lafuente (stronk7)
701570b5e4 Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle 2011-07-11 19:47:14 +02:00
Eloy Lafuente (stronk7)
d5497dcc86 MDL-28109 scorm - new settings => version bump 2011-07-11 15:54:11 +02:00
Eloy Lafuente (stronk7)
2abfc1c630 Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle 2011-07-11 15:42:21 +02:00