Commit graph

1177 commits

Author SHA1 Message Date
Dan Marsden
6eca9e1c63 MDL-28017 SCORM - remove admin setting incorrectly added as it was never used. 2011-07-11 15:42:53 +12:00
Dan Marsden
3c0b04c440 MDL-28109 - allow admin to decide which scorm settings are advanced, tidy up order of settings 2011-07-11 10:18:16 +12:00
Dan Marsden
0ffaa76be3 MDL-28109 - allow adming to decide which scorm settings are advanced, tidy up order of settings 2011-07-10 11:10:56 +12:00
Dan Marsden
c5803aaa7f MDL-27947 - fix TOC display on skipview - use correct org in TOC title 2011-07-09 11:40:32 +12:00
Dan Marsden
8a4561accc SCORM MDL-26942 - get first scoid if not set 2011-07-09 11:06:36 +12:00
Dan Marsden
8cb7096bc5 SCORM MDL-26942 - fix ending of lists. 2011-07-09 11:06:35 +12:00
Dan Marsden
b6c88d755b SCORM MDL-26942 - initial fix for list in toc 2011-07-09 11:06:35 +12:00
Dan Marsden
0797000aa9 SCORM MDL-26942 - move scorm_get_toc to locallib.php 2011-07-09 11:06:35 +12:00
Dan Marsden
27a9658f97 SCORM MDL-26942 remove empty file and add todo 2011-07-09 11:06:35 +12:00
Dan Marsden
db0a77cc1a SCORM MDL-26942 merge scorm_get_toc to decrease duplicated code and simplify toc display 2011-07-09 11:05:54 +12:00
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Dan Marsden
d9306a9c1f SCORM MDL-28110 fix string name 2011-07-03 12:51:56 +12:00
Dan Marsden
0ab985f918 SCORM MDL-28110 set default for forcejavascript to yes - add string explaining what it does. 2011-07-03 12:51:56 +12:00
Dan Marsden
ca4eda13b5 SCORM MDL-28111 tidy up formatting of code 2011-07-03 12:49:29 +12:00
Dan Marsden
f7b5c6aae6 SCORM MDL-28111 tidy up formatting of code 2011-07-03 12:49:29 +12:00
Eloy Lafuente (stronk7)
715a5bb732 MDL-27829 blocks - lang string fixes. Credit goes to Helen! 2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
ca2b89d5df Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle 2011-06-30 01:10:51 +02:00
Dan Marsden
444ff001a1 SCORM MDL-28016 - fix redirect call to use proper moodle_url 2011-06-29 20:31:19 +12:00
Andrew Davis (andyjdavis)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Dan Marsden
1a70a6470c SCORM MDL-27366 - show content if attemptstatus is set even if closed. 2011-06-17 09:08:26 +12:00
Dan Marsden
6257f66455 SCORM MDL-27366 add attempt status to My home 2011-06-17 09:08:26 +12:00
Eloy Lafuente (stronk7)
5800c0fde1 Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle 2011-06-15 01:18:05 +02:00
Dan Marsden
bdea587be2 SCORM MDL-27858 - fix typo 2011-06-15 10:31:52 +12:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Eloy Lafuente (stronk7)
269c173e81 whitespace fixes 2011-06-13 12:21:48 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Sam Hemelryk
12aafa8769 Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle 2011-06-13 15:49:24 +08:00
Dan Marsden
d1e3b5c2d3 MDL-27404 SCORM fix for IE 6 - thanks to Howard Miller 2011-06-13 11:32:26 +12:00
Dan Marsden
2875714e4a MDL-27522 SCORM tidy up commit 2011-06-13 11:00:43 +12:00
Ankit Kumar Agarwal
b4baa7faa3 MDL-27522 SCORM - seperate user report from main report page to allow better re-use in preparation for MDL-27256 2011-06-13 10:21:40 +12:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
David Mudrak
c5c315e2a7 MDL-27718 Migrate files embedded in the activity intro fields
Contains various fixed spotted through the way, too.
2011-06-05 17:37:58 +02:00
Aparup Banerjee
a1cac902ec MDL-27449 Backup - migrating scorm file within scorm module 1.9 backup converter 2011-05-31 11:29:48 +08:00
Aparup Banerjee
0e7269d11d MDL-27449 Backup - added scorm module 1.9 backup converter 2011-05-30 14:20:35 +08:00
Eloy Lafuente (stronk7)
94a74f549a MDL-26704 gradebook: adding TODO comment to avoid forgetting 2011-05-17 11:58:22 +02:00
Andrew Davis (andyjdavis)
4433f871f2 MDL-26704 gradebook: added some intelligence to the dates displayed on the user outline activity report 2011-05-10 11:14:16 +08:00
Aparup Banerjee
60b5a2fec7 MDL-27251 Files API - added timeout re-calculation as an optional argument. added setting for minimum Kbps for large files fetched from internet where the passed in timeout maybe too low.
allowed turning off the http HEAD request timeout calculation with zero (or negative) bitrate

	This was added in to allow servers that have a problem with
	HEAD requests to carry on with the given timeout without re-calculations.
	See PULL-651 for the discussion.

	the optional argument to force recalculation of timeout has been forced within scorm/locallib.php

	timeout re-calculation only increments timeout.
2011-04-27 10:49:40 +08:00
Petr Skoda
af4378aee9 Merge branch 'master_MDL-26880_SCORM2004_tracking_fix' of git://github.com/danmarsden/moodle 2011-04-17 17:16:03 +02:00
Petr Skoda
13516b7c1f Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle 2011-04-17 17:09:05 +02:00
Dan Marsden
4f4a8acf3b SCORM MDL-24734 - fix display of grade information on view.php page - also fixes some XHTML in the same function. 2011-04-16 19:34:04 +12:00
Matteo Scaramuccia
74ef6bd82d PULL-498 - Fixed potential issues about UTF-8 and multilang filter by adopting pure ASCII chars, the SCO primary key 2011-04-14 10:28:36 +12:00
Matteo Scaramuccia
0ec0224b9a MDL-26880 - Fixed missing of activity id
Moved errorCode as global, to allow GetLastError() to work
Applied MDL-17891 mechanism against AJAX failures, "true if true, false otherwise"
Limited what added to log when in debug, to be compliant with mdl_log.action as VARCHAR(40)
2011-04-14 10:28:31 +12:00
Dan Marsden
4f6e39db5e Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup 2011-04-14 09:15:48 +12:00
Dan Marsden
3825bed0e8 SCORM MDL-18392 - remove old call to stripslashes 2011-04-13 20:05:30 +12:00
Matteo Scaramuccia
454f5aeef6 SCORM MDL-18392 MDL-26282 - Fixed calls to add/strip slashes 2011-04-13 20:05:19 +12:00
sam marshall
6553cda7c9 MDL-26778 Change to completion should immediately affect nav block
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
2011-04-11 12:40:13 +01:00
Eloy Lafuente (stronk7)
b9c6ce2d19 Merge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com/scara/moodle 2011-03-21 21:38:23 +01:00
Eloy Lafuente (stronk7)
be5eb0013e Merge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle 2011-03-21 21:15:54 +01:00
Matteo Scaramuccia
c6e46d37bc MDL-26905 - Fixed missing of currentorg initialization in AICC API 2011-03-20 23:54:39 +01:00