Commit graph

1206 commits

Author SHA1 Message Date
Dan Poltawski
05165a7f60 Merge branch 'm23_MDL-34644' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-09-18 09:27:19 +08:00
Simon Coggins
a698454089 MDL-34644 SCORM fix completion when only completion on view is selected. 2012-09-13 14:39:12 +12:00
Sam Hemelryk
6d661aa2f1 Merge branch 'm23_MDL-34755' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-09-11 15:02:26 +12:00
Dan Marsden
fa3a1652bf MDL-35123 SCORM: cleaner version of get_last_attempt and get_last_completed_attempt, fixes support for MS Sql driver 2012-09-06 18:45:43 +12:00
Simon Coggins
b91833db8a MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:12:34 +12:00
Dan Marsden
8dc49e14c4 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-08 02:00:23 +02:00
Sam Hemelryk
f315e3e184 Merge branch 'm23_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-07-23 11:38:09 +12:00
Sam Hemelryk
93c3b29893 Merge branch 'm23_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-07-23 11:26:50 +12:00
Ankit Agarwal
8119fbd7bd MDL-34265 SCORM: Removing sorting from unsortable columns 2012-07-19 15:58:36 +08:00
Dan Marsden
001ff67298 MDL-34233 SCORM backup - change to using set_source_sql to preserve order of records in backup. 2012-07-19 19:40:02 +12:00
Dan Marsden
fece4fd648 MDL-34374 SCORM prevent skipview being set to always when used inside a SCORM course format. 2012-07-19 09:05:07 +12:00
Dan Marsden
6b8399df5e MDL-34198 SCORM remove unecessary get_records call 2012-07-10 08:34:42 +08:00
Gilles-Philippe Leblanc
65ab8112a3 MDL-33822 SCORM Interactions report - fix formatting of empty cells. 2012-07-09 17:24:29 +12:00
Dan Poltawski
741543e9a7 Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Conflicts:
	mod/scorm/db/upgrade.php
2012-07-03 12:18:29 +08:00
Dan Marsden
0ba1ee1dd2 MDL-33914 SCORM show scrollbar on TOC if too long. 2012-07-02 16:14:23 +08:00
Dan Poltawski
6253f69246 Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle into MOODLE_23_STABLE 2012-07-02 15:50:18 +08:00
Dan Marsden
800fb7533e MDL-33978 SCORM activity completion - don't tiggere completion update state on creation of SCORM 2012-07-02 13:44:35 +08:00
Aparup Banerjee
b574c078a6 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:37:01 +08: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
Petr Skoda
f596005b6c MDL-32569 drop migrated module tests 2012-04-21 16:58:07 +02:00
Dan Marsden
d5159fb8d3 MDL-29975 SCORM improve pop-up generation 2012-04-20 10:28:12 +12:00
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