Aparup Banerjee 5433da6064 Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle ...

- resolved conflicts.

2011-09-13 11:39:06 +08:00

..

backup

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

datamodels

Revert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"

2011-08-17 02:27:50 +02:00

db

Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle

2011-08-10 22:46:42 +02:00

lang/en

MDL-27624 Small structural changes

2011-08-19 11:17:19 +12:00

pix

MDL-26623 fix file permissions

2011-03-01 12:26:49 +01:00

report

MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently

2011-09-08 09:30:27 +12:00

simpletest

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

aicc.php

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

api.php

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

datamodel.php

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

grade.php

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

index.php

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

lib.php

MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory().

2011-09-10 10:43:49 +02:00

loaddatamodel.php

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

loadSCO.php

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

locallib.php

Merge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle

2011-08-17 00:32:23 +02:00

mod_form.php

MDL-28701 Change uses of make_upload_directory(temp) to make_temp_directory().

2011-09-10 10:43:49 +02:00

module.js

Merge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle

2011-08-16 23:42:59 +02:00

player.js

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

player.php

MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently

2011-09-08 09:30:27 +12:00

prereqs.php

SCORM MDL-28111 tidy up formatting of code

2011-07-03 12:49:29 +12:00

report.php

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

reportsettings_form.php

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

request.js

Fixed some bugs and typos

2006-02-03 08:04:57 +00:00

settings.php

Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle

2011-07-12 16:28:36 +02:00

styles.css

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

tabs.php

MDL-27523 Fixing get_string issues

2011-07-15 09:27:02 +12:00

userreport.php

MDL-27624 SCORM formating codes

2011-08-19 11:17:19 +12:00

version.php

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

view.php

MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently

2011-09-08 09:30:27 +12:00