Sam Hemelryk f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle ...

Conflicts:
	user/view.php

2013-01-09 09:34:22 +13:00

..

backup

MDL-34233 SCORM backup - change to using set_source_sql to preserve order of records in backup.

2012-07-19 19:38:14 +12:00

datamodels

MDL-36357 cleanup - remove double semicolons

2012-11-15 09:51:26 +08:00

db

MDL-37032 upgrade: define all the 2.4.0 points

2012-12-11 13:11:11 +01:00

lang/en

Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle

2012-12-11 22:42:09 +01:00

pix

MDL-36436 use hacky aspect ratio to work around IE9 issues

2012-11-20 13:01:27 +01:00

report

MDL-36855 scorm: update to api get_scorm_question_count()

2013-01-03 14:40:36 +08:00

tests

MDL-32149 tests for mod_wiki, mod_lti and mod_scorm

2012-04-03 22:30:59 +02:00

aicc.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

datamodel.php

MDL-36467 SCORM: remove old debugging superceded by full scorm debugger

2012-11-13 09:02:43 +13:00

grade.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

index.php

MDL-35339 avoid using get_all_sections(), get_all_mods() and field section.sequence directly

2012-10-15 14:08:13 +08:00

lib.php

MDL-36828: mod_scorm: Allow deletion of scorm modules if no scorm_scoes data exists

2012-11-26 15:30:49 +10:30

loaddatamodel.php

MDL-35418 SCORM: coding guideline tidy - removes a few unused vars as well.

2012-10-15 19:25:01 +13:00

loadSCO.php

MDL-36142 Incorrect SQL query (wrong usare of quotes) returns HTTP 404 due to a dml_read_exception

2012-10-19 22:36:26 +02:00

locallib.php

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

2012-12-12 08:43:29 +08:00

mod_form.php

MDL-36641 Missing HTTP check when using an external resource

2012-11-26 07:43:17 +01:00

module.js

MDL-31683 mod_assign: Fixed up whitespace and cap check changes as required

2012-10-17 11:17:53 +08:00

player.js

MDL-32388 SCORM: Fix chrome pop-ups

2012-04-11 20:46:53 +12:00

player.php

MDL-35418 SCORM: Improve SCORM 2004 support

2012-10-15 19:25:01 +13:00

prereqs.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

report.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

reportsettings_form.php

MDL-28277 Small fixes

2011-11-03 07:45:52 +05:30

request.js

MDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and burn.

2012-11-23 20:20:46 +13:00

settings.php

MDL-33938 SCORM use consistant naming for maxattempt setting - match setting name with db field name to help when matching default settings

2012-06-22 21:51:04 +12:00

styles.css

MDL-33755 mod/scorm: directview scorm activity

2012-09-06 20:28:42 +12:00

tabs.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

userreport.php

MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

2012-07-24 17:08:05 +08:00

version.php

MDL-36933 Bump everything to 2012112900

2012-11-30 03:30:09 +01:00

view.js

MDL-33755 SCORM: fix the way launch is triggered

2012-09-12 20:16:57 +12:00

view.php

MDL-34848 SCORM: add extra flexibiltiy to attempt status

2012-09-19 19:53:03 +12:00