Dan Poltawski
06c548c783
Merge branch 'w33_MDL-34741_m24_yui2in3' of git://github.com/skodak/moodle
2012-08-14 15:33:10 +08:00
Aparup Banerjee
2cfd8f9427
Merge branch 'MDL-34337-master' of git://github.com/ankitagarwal/moodle
2012-08-13 10:16:03 +08:00
Petr Škoda
1a92858d80
MDL-34741 use 2in3 in mod_scorm
2012-08-11 20:40:06 +02:00
Ankit Agarwal
0253b26034
MDL-34336 scorm: Updating export of interaction reports as csv, to use new csv exporter class
2012-08-10 11:20:47 +08:00
Ankit Agarwal
4d26f274c4
MDL-34337 scorm: Updating export of basic reports as csv, to use new csv exporter class
2012-08-10 11:19:27 +08:00
Dan Marsden
299aedfaf7
MDL-34656 prevent login form from being shown inside iframe - also prevent wantsurl from being set to loadsco.php which isn't a valid page for initial load.
2012-08-02 19:33:13 +12:00
Ankit Agarwal
a3fc4b3ad6
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
Sam Hemelryk
f49eff005e
Merge branch 'master_MDL-34374' of git://github.com/danmarsden/moodle
2012-07-23 11:38:19 +12:00
Sam Hemelryk
ce4182a46a
Merge branch 'master_MDL-34233' of git://github.com/danmarsden/moodle
2012-07-23 11:26:59 +12:00
Ankit Agarwal
1868607ad6
MDL-34265 SCORM: Removing sorting from unsortable columns
2012-07-19 15:58:46 +08:00
Dan Marsden
295c012de7
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
Dan Marsden
bb5cc0e964
MDL-34374 SCORM prevent skipview being set to always when used inside a SCORM course format.
2012-07-18 10:32:46 +12:00
Dan Poltawski
5c509b058e
Merge branch 'master_MDL-34198' of git://github.com/danmarsden/moodle
2012-07-10 08:34:18 +08:00
Sam Hemelryk
357f4d8ed7
Merge branch 'master_MDL-33822' of git://github.com/danmarsden/moodle
2012-07-09 17:24:13 +12:00
Ankit Agarwal
9381c28084
MDL-33702 scorm: refactoring interraction report to use '2004 SCORM' score elements
2012-07-09 11:27:34 +08:00
Ankit Agarwal
57a32d3eb6
MDL-33702 scorm: Adding support for '2004 SCORM' progress status elements
2012-07-09 11:27:34 +08:00
Ankit Agarwal
d875cf9cdf
MDL-33702 scorm: Adding support for '2004 SCORM' objectives status elements
2012-07-09 11:27:34 +08:00
Ankit Agarwal
1c2b2132e5
MDL-33702 scorm: Adding suppport for '2004 SCORM standard' score elements
2012-07-09 11:27:34 +08:00
Dan Marsden
c24bdac7dd
MDL-34198 SCORM remove unecessary get_records call
2012-07-06 09:53:59 +12:00
Gilles-Philippe Leblanc
f007c032be
MDL-33822 SCORM Interactions report - fix formatting of empty cells.
2012-07-06 09:45:44 +12:00
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
Dan Poltawski
6a84f5ae74
Merge branch 'master_MDL-33914' of git://github.com/danmarsden/moodle
2012-07-02 16:14:07 +08:00
Dan Poltawski
637406f3c0
Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle
2012-07-02 15:50:09 +08:00
Dan Poltawski
c252db3dbe
Merge branch 'master_MDL-33978' of git://github.com/danmarsden/moodle
2012-07-02 13:44:10 +08:00
Aparup Banerjee
99c3c503e0
MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts.
2012-06-29 11:41:09 +08:00
Dan Marsden
c2c5c2f8c7
MDL-33978 SCORM activity completion - don't tiggere completion update state on creation of SCORM
2012-06-25 12:23:52 +12:00
Dan Marsden
f0a1cc8ea8
MDL-33914 SCORM show scrollbar on TOC if too long.
2012-06-22 22:21:56 +12:00
Dan Marsden
e0d90c54c0
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
Eloy Lafuente (stronk7)
c5e783e512
MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700
2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
130aed6e7e
MDL-33794 version.php: Fix some missing bits before bump.
2012-06-17 19:29:44 +02:00
Dan Poltawski
38569ad3a2
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
2012-06-13 10:12:21 +08:00
Dan Marsden
cb6782d4a5
MDL-32937 SCORM: better lang for dnd interface
2012-06-13 09:59:11 +12:00
Dan Poltawski
8550d72d85
MDL-32937 - scorm: switch commenting style to //
2012-06-12 13:18:51 +08:00
Dan Poltawski
91f0dd438a
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
2012-06-12 13:05:47 +08:00
Christopher Tombleson
01b5936cd0
MDL-32937 Add drag and drop support to SCORM
2012-06-11 12:18:32 +12:00
Dan Marsden
e099166635
MDL-33515 SCORM - attempts grading setting is confusing - last attempt is really last completed attempt.
2012-06-08 20:33:38 +12:00
Sam Hemelryk
849b9a6af7
MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts
2012-05-29 16:44:28 +12:00
Matteo Scaramuccia
8ac8aae4f4
MDL-33053 AICC: Incorrect Table Of Content hierarchy using "structured" AICC
...
courses
[Fix] 'scorm_scoes' doesn't contain all the entries described in the DES file
[Fix] HTMLizing the parent relationship, described in the CST file,
fails: it considers 'index = 0' (found) equals to 'false' (not found)
2012-05-22 00:47:01 +02:00
Helen Foster
2e6b68f4a8
MDL-32925 lang: Add extended help texts for all modules
...
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.
AMOS BEGIN
REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
Dan Marsden
0ae299769c
MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change.
2012-05-15 09:36:35 +12:00
Sam Hemelryk
137467f5b4
Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle
2012-05-10 13:58:12 +12:00
Dan Marsden
37ca1722cd
MDL-32507 SCORM fix some strict standard errors
2012-05-08 09:00:46 +12:00
Dan Marsden
3cc7515843
MDL-30598 SCORM fix a few coding guideline issues, tidy up phpdocs
2012-05-07 21:08:53 +12:00
Christopher Tombleson
1273dde9f7
MDL-30598 SCORM api.php moved to loaddatamodel.php
...
Merged api.php into loaddatamodel.php. Changed all references to api.php
to point at loaddatamodel.php
2012-05-07 14:41:57 +12:00
Petr Skoda
99302c5e96
MDL-26028 cleanup all IE6 gzip hacks
2012-04-28 18:00:06 +02:00
Eloy Lafuente (stronk7)
d7f84a2962
Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle
2012-04-25 15:14:27 +02:00
David Mudrak
261cbbacc1
MDL-32471 preview thumbnails support for activity modules
...
Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.
2012-04-24 12:09:45 +02:00
Dan Poltawski
bebf083159
Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle
2012-04-23 11:47:11 +08:00
Dan Poltawski
f488088109
Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle
2012-04-23 11:21:06 +08:00
Petr Skoda
cdbea7eed1
MDL-31607 use full course object for require_login() if already available
...
This eliminates 1 db query.
2012-04-22 17:41:47 +02:00