Commit graph

1558 commits

Author SHA1 Message Date
Dan Marsden
c7e6fb6c8d MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function. 2013-08-26 13:06:59 +12:00
Damyon Wiese
aee8151f7d Revert "MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function."
This reverts commit 492407e9f7.
2013-08-22 14:11:18 +08:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
Damyon Wiese
90a5a4b620 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-21 11:38:37 +08:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle
Conflicts:
	course/lib.php
2013-08-21 12:08:46 +12:00
Dan Marsden
492407e9f7 MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function. 2013-08-16 09:34:06 +12:00
Matteo Scaramuccia
9d507f1d70 MDL-37393 SCORM: Fixed PHP Strict Standards errors with AICC packages 2013-08-16 09:28:41 +12:00
Dan Marsden
d4978e044e MDL-37393 SCORM: Fix existing AICC scoes to use correct parent/child relationships
also fix bad version used by patch in MDL-39239
2013-08-16 09:28:40 +12:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Mayank Gupta
0264b3eaac MDL-40773 mod_scorm: convert yui2 -> yui3 2013-08-09 13:10:39 +12:00
Eloy Lafuente (stronk7)
154bc6b240 Merge branch 'w30_MDL-40642_m26_umask' of https://github.com/skodak/moodle 2013-07-23 23:42:11 +02:00
Sam Hemelryk
97ff2341b3 Merge branch 'master_MDL-40702' of git://github.com/danmarsden/moodle 2013-07-23 13:59:16 +12:00
Petr Škoda
eb459f7192 MDL-40642 set more restrictive umask and use proper permission for new dirs and files 2013-07-19 09:18:44 +02:00
Dan Marsden
57f32aa32e MDL-40702 SCORM: - use iframe instead of object - iframe is supported better. 2013-07-17 14:32:20 +12:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Eloy Lafuente (stronk7)
4c8bba6686 MDL-39926 SCORM: Adapt report to alt name fields 2013-07-16 18:34:59 +02:00
Eloy Lafuente (stronk7)
88ad6d0a99 Merge branch 'master_MDL-39926' of git://github.com/danmarsden/moodle 2013-07-16 18:34:58 +02:00
Sam Hemelryk
05fb99ac70 Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle 2013-07-10 10:10:11 +12:00
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields
Add support for additional name fields and flexible formating of
user names.
2013-07-09 11:45:50 +08:00
Dan Marsden
f2b3e82b09 MDL-37484 SCORM: disable toc in player when using direct AICC url 2013-07-05 14:37:20 +12:00
Dan Marsden
1554cfcd8f MDL-39926 SCORM: new Objectives report type 2013-07-05 13:18:10 +12:00
Dan Marsden
957566eb28 MDL-40512 SCORM: prevent undefined warning 2013-07-05 12:07:48 +12:00
Eloy Lafuente (stronk7)
9a6a2d1ce0 Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle 2013-07-02 00:46:30 +02:00
Tim Gus
74816ad801 MDL-40259 - For SCORM reports limit fields returned from
get_users_by_capability to user ID to decrease memory utilization
2013-06-20 15:48:40 -04:00
Sam Hemelryk
68e33c2932 Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle 2013-06-17 16:14:00 +12:00
Dan Poltawski
19c1e0b80a Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle 2013-06-12 16:49:29 +08:00
Dan Marsden
93c984a829 MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway. 2013-06-12 09:47:26 +12:00
Matteo Scaramuccia
6a75660eff MDL-40095 SCORM: Trivial comments tidy up 2013-06-10 20:48:05 +02:00
Matteo Scaramuccia
82bd0c6643 MDL-40095 SCORM: Fixed DML error when saving with completion options locked
Regression caused by MDL-38315.
2013-06-10 20:47:48 +02:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
David Mudrák
b60ab47cb7 MDL-39939 Fix the basic SCORM report plugin name 2013-05-30 22:42:12 +02:00
Jason Fowler
f505aab201 MDL-39227 - SCORM - repositioning the navigation panel to be visible in all themes at all resolutions 2013-05-22 15:14:56 +08:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Damyon Wiese
e872912d1c Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle 2013-05-20 12:12:23 +08:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Frederic Massart
9fba869836 MDL-38757 scorm: Remove advanced settings (except for Appearance) 2013-05-09 17:20:11 +08:00
Frederic Massart
20b51a1134 MDL-38757 scorm: Reformat SCORM package module settings 2013-05-09 17:20:07 +08:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00
Damyon Wiese
da97cfe35e Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle 2013-05-06 21:57:19 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
sam marshall
a9f5fc158c MDL-38315 Completion: Bugs with 'locked' status in activity form 2013-05-01 11:57:29 +01:00
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle
Conflicts:
	mod/wiki/mod_form.php
2013-05-01 11:15:24 +12:00
Dan Poltawski
a74cd33160 MDL-39422 mod_forms: prevent long coruse module names
To prevent ugly DB errors.
2013-04-30 17:41:36 +01:00
Ankit Agarwal
d8d0b8b390 MDL-39363 scorm: Accept 0 as a valid score 2013-04-29 16:53:15 +08:00
Ankit Agarwal
325c730ba1 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:26:09 +08:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Davo Smith
c23ff8e3a5 MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:09 +01:00