1163 Commits

Author SHA1 Message Date
Sam Hemelryk
6669669fdb Merge branch 'MDL-29174-master' of git://github.com/raymanuk/moodle 2012-04-16 17:37:06 +12:00
Dan Marsden
b952d27517 MDL-32388 SCORM: Fix chrome pop-ups 2012-04-11 20:46:53 +12:00
Petr Skoda
ba0c484308 MDL-32149 tests for mod_wiki, mod_lti and mod_scorm 2012-04-03 22:30:59 +02:00
Ray Guo
8e6530d897 MDL-29174 Remove the empty modulename_extend_navigation() stub from 7
modules.
2012-04-03 14:38:47 +01:00
Sam Hemelryk
c194925278 Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle 2012-03-27 09:51:40 +13:00
Eloy Lafuente (stronk7)
a176999cc5 Merge branch 'MDL-32202' of git://github.com/stronk7/moodle 2012-03-26 21:36:08 +02:00
Eloy Lafuente (stronk7)
704f82e2bf MDL-32202 scorm: fix 2 invalid default="null" definitions
Note the whole file has been changed because its previous
(manual!) commit leaded to incorrect indentation, but really
only 2 definitions have been changed:

scorm->completionstatusrequired
scorm->completionscorerequired
2012-03-26 21:27:47 +02:00
Dan Poltawski
2ce1efb8ac Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle 2012-03-26 10:51:38 +08:00
Dan Marsden
dbdc735559 MDL-32147 - use correct 404 for server type 2012-03-23 10:01:04 +13:00
Dan Marsden
6ceef54c6e MDL-32147 SCORM improve performance of 404s for files inside SCORM packages. 2012-03-22 20:05:59 +13:00
Sam Hemelryk
3222f6eca1 Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle 2012-03-22 10:44:04 +13:00
Petr Skoda
5bd4040866 MDL-31857basic phpunit support
Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.
2012-03-21 10:31:37 +01:00
Dan Poltawski
0a4660484c Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
    mod/scorm/db/upgrade.php
2012-03-21 11:38:09 +08:00
Aaron Barnes
94db27498d MDL-27469 scorm: Add extra activity completion conditions 2012-03-21 09:48:38 +13:00
Dan Marsden
c1b81ff623 MDL-32080 SCORM - remove old css 2012-03-16 13:16:05 +13:00
Tim Hunt
88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
Sam Hemelryk
c8c00cee80 MDL-29745 Fixed white space 2012-03-13 16:36:37 +13:00
Sam Hemelryk
a28c6b40fe Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle 2012-03-13 16:35:15 +13:00
Ankit Agarwal
e2f6cb436a MDL-22895 scorm: Fixed up issues with graph report 2012-03-13 09:31:01 +08:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Ankit Kumar Agarwal
e61a71379c MDL-29745 SCORM Introducing new Graphs report for scorm module 2012-03-12 15:02:26 +08:00
Sam Hemelryk
fe0979ea3d Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/styles.css
2012-03-12 17:29:39 +13:00
Petr Skoda
bb88a54d06 MDL-31985 remove text sizes from all install.xml files 2012-03-11 15:55:37 +01:00
Dan Marsden
85a2d566e2 MDL-31888 SCORM prevent scrollbars on yui div 2012-03-07 09:01:45 +13:00
Petr Skoda
c3dd6b01fe MDL-27982 drop UNSIGNED attributes from all install.xml files 2012-03-06 12:01:10 +01:00
Dan Marsden
1a27cb5da7 MDL-31749 - remove extra space from scorm pop-up - especially for afterburner theme 2012-03-02 09:13:07 +13:00
Eloy Lafuente (stronk7)
d8c9ff403b Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle 2012-03-01 00:25:18 +01:00
Eloy Lafuente (stronk7)
1f256ec5ca Merge branch 'MDL-30982-docblock-backup' of git://github.com/mudrd8mz/moodle 2012-02-29 00:47:10 +01:00
David Mudrak
63baccbc54 MDL-30982 Improving phpDocs for the classes that extend backup_activity_task 2012-02-27 11:59:42 +01:00
Petr Skoda
e67bc2a410 MDL-30964 fix phpdocs in access.php files in all plugins 2012-02-27 07:23:10 +01:00
Eloy Lafuente (stronk7)
2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Sam Hemelryk
6007f8d8d8 Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle 2012-02-20 17:04:45 +13:00
Sam Hemelryk
22fbfa3b2f Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle 2012-02-20 16:03:19 +13:00
Sam Hemelryk
26fad611da Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle 2012-02-20 15:57:12 +13:00
Sam Hemelryk
9405721002 Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle 2012-02-20 15:49:41 +13:00
Dan Marsden
1c6df63d5c SCORM MDL-31381 decrease max width of TOC to prevent SCORM content from being hidden, remove padding from pop-up and improve maxheight calculation 2012-02-17 17:14:12 +13:00
Ankit Agarwal
d6ae6816d0 MDL-30965 SCORM Removing unused variable ->head 2012-02-17 08:46:45 +05:30
Dan Marsden
6a3f2ad229 MDL-31659 SCORM remove old file and reference to it - it hasn't been used since the rework of SCORM player in MDL-22951 2012-02-17 15:29:36 +13:00
Dan Marsden
9e93f995dc SCORM MDL-31397 - add slashes to js string 2012-02-17 15:22:52 +13:00
Dan Marsden
8aba9cda72 MDL-31652 SCORM - hide updatefreq setting and remove it if not required. 2012-02-16 12:16:02 +13:00
Dongsheng Cai
d2b7803e5a MDL-30973 Files API, check and update DocBlock 2012-02-15 12:48:57 +08:00
Andrew Davis
a153c9f2fe MDL-30999 grade: updated Grade API phpdocs 2012-02-14 14:04:19 +07:00
Ankit Kumar Agarwal
04252d3a13 MDL-30975 Docs Adding correct pacakge information 2012-02-13 11:06:47 +05:30
Dan Marsden
047b4e83ab SCORM AICC MDL-31039 update external AICC url correctly - thanks to Albert Rhemrev for report/fix 2012-01-27 19:41:59 +13:00
Mayank Gupa
d6296b71cc MDL-30578, Updating CMILongIdentifer read comments at tracker 2012-01-16 00:10:22 +05:30
Mayank Gupa
c9e7d6eb81 MDL-30578, Updating CMILongIdentifer to check for valid URI (RFC 3986 [6]) and URN syntax as per RFC 2141 [3] 2012-01-16 00:10:20 +05:30
Sam Hemelryk
9b69f4a9c9 Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle 2012-01-09 12:02:41 +13:00
Ankit Kumar Agarwal
85e976e514 MDL-30652 SCORM Fixing report prefrences display for interactions report 2012-01-03 10:38:41 +05:30
Ankit Kumar Agarwal
2af0e47259 MDL-30652 SCORM Fixing report prefrences display issue for basic report 2012-01-03 10:38:37 +05:30
Ankit Kumar Agarwal
e12459baa2 MDL-30652 Scorm adding proper comments 2012-01-03 10:38:07 +05:30