1292 Commits

Author SHA1 Message Date
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
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
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