Sam Hemelryk 322d9c8cda Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle ...

Conflicts:
	mod/scorm/db/upgrade.php

2013-09-27 11:32:05 +12:00

..

backup

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

datamodels

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

db

Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

2013-09-27 11:32:05 +12:00

lang/en

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

2013-09-25 09:27:44 +12:00

pix

…

report

Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle

2013-09-17 11:10:44 +10:00

tests

MDL-28579 scorm: Fix broken unit tests

2013-09-04 09:44:05 +08:00

aicc.php

…

datamodel.php

…

grade.php

…

index.php

MDL-41612 scorm: fix heading levels

2013-09-16 15:40:01 +08:00

lib.php

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

2013-09-25 09:27:44 +12:00

loaddatamodel.php

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

loadSCO.php

MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos

2013-09-24 12:08:38 +12:00

locallib.php

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

2013-09-25 09:27:44 +12:00

mod_form.php

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

2013-09-25 09:27:44 +12:00

module.js

MDL-39910 mod_scorm: fix enable/disable navigation buttons

2013-09-26 00:10:10 +12:00

player.js

…

player.php

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

prereqs.php

…

renderer.php

MDL-41290 SCORM: Improve user report

2013-09-04 09:56:48 +12:00

report.php

MDL-41612 scorm: fix heading levels

2013-09-16 15:40:01 +08:00

reportsettings_form.php

…

request.js

…

settings.php

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

styles.css

MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings

2013-09-25 19:25:37 +12:00

tabs.php

…

version.php

MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

2013-09-20 22:45:36 +12:00

view.js

MDL-38489 SCORM: use course_get_format to obtain info

2013-09-16 10:17:51 +12:00

view.php

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

2013-09-19 09:49:31 +12:00