Dan Poltawski d4c16e8b63 Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle ...

Conflicts:
	mod/scorm/db/upgrade.php

2012-07-03 12:19:07 +08:00

..

backup

MDL-27469 scorm: Add extra activity completion conditions

2012-03-21 09:48:38 +13:00

datamodels

Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle

2012-07-02 15:50:09 +08:00

db

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

2012-07-03 12:19:07 +08:00

lang/en

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

2012-06-13 10:12:21 +08:00

pix

MDL-26623 fix file permissions

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

report

MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700

2012-06-18 02:37:00 +02:00

tests

MDL-32149 tests for mod_wiki, mod_lti and mod_scorm

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

aicc.php

MDL-27036 AICC HACP handling - add missing check for correct user with has_capability.

2011-11-14 21:20:14 +13:00

datamodel.php

MDL-31607 use full course object for require_login() if already available

2012-04-22 17:41:47 +02:00

grade.php

MDL-31607 use full course object for require_login() if already available

2012-04-22 17:41:47 +02:00

index.php

SCORM MDL-28111 tidy up formatting of code

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

lib.php

MDL-33978 SCORM activity completion - don't tiggere completion update state on creation of SCORM

2012-06-25 12:23:52 +12:00

loaddatamodel.php

MDL-30598 SCORM fix a few coding guideline issues, tidy up phpdocs

2012-05-07 21:08:53 +12:00

loadSCO.php

MDL-26028 cleanup all IE6 gzip hacks

2012-04-28 18:00:06 +02:00

locallib.php

MDL-33053 AICC: Incorrect Table Of Content hierarchy using "structured" AICC

2012-05-22 00:47:01 +02:00

mod_form.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

module.js

MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change.

2012-05-15 09:36:35 +12:00

player.js

MDL-32388 SCORM: Fix chrome pop-ups

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

player.php

MDL-32507 SCORM fix some strict standard errors

2012-05-08 09:00:46 +12:00

prereqs.php

MDL-31607 use full course object for require_login() if already available

2012-04-22 17:41:47 +02:00

report.php

MDL-31607 use full course object for require_login() if already available

2012-04-22 17:41:47 +02:00

reportsettings_form.php

MDL-28277 Small fixes

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

request.js

…

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-33914 SCORM show scrollbar on TOC if too long.

2012-06-22 22:21:56 +12:00

tabs.php

MDL-28277 Small fixes

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

userreport.php

MDL-31607 use full course object for require_login() if already available

2012-04-22 17:41:47 +02:00

version.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

view.js

MDL-29975 SCORM improve pop-up generation

2012-04-20 10:28:12 +12:00

view.php

Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle

2012-04-23 11:47:11 +08:00