Commit graph

2008 commits

Author SHA1 Message Date
Dan Poltawski
88dbfc453e Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle 2013-04-23 12:50:44 +01:00
Ankit Agarwal
647a3fc81c MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 12:03:00 +08:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
Conflicts:
	mod/scorm/module.js
2013-04-19 15:20:02 +01:00
Davo Smith
c4dccb99fb MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:44:24 +01:00
Dan Poltawski
f7f1465f91 Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-16 13:26:34 +01:00
Matteo Scaramuccia
5ecd13bc66 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-04-11 22:44:29 +02:00
Matteo Scaramuccia
aefeca7793 MDL-35840 SCORM TOC: fixed a typo, improvements on getting the focus 2013-04-08 09:43:20 +12:00
Dan Marsden
c848280ad8 MDL-37844 SCORM: fix js error and highlight selected node in TOC. 2013-04-08 09:39:05 +12:00
Andrea Bicciolo
0e633595d8 MDL-38480_m Fix for messy usage of language strings in block course overview 2013-04-05 12:30:22 +02:00
Dan Poltawski
c39896e85d Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets"
This reverts commit fe104762c9.
2013-04-05 14:34:07 +08:00
Dan Poltawski
369496c31e Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-03 17:22:38 +08:00
Aparup Banerjee
b8eb2f3dc6 Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle 2013-04-03 16:48:53 +08:00
Dan Poltawski
899fd9372f Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle 2013-04-02 16:11:01 +08:00
Matteo Scaramuccia
fd10686843 MDL-38745 SCORM: fixed appending 'API logging is on|off', once per launch 2013-03-28 22:28:06 +01:00
Matteo Scaramuccia
cc351edaf0 MDL-38745 SCORM: fixed doubling double quotes for 'even' and 'odd' 2013-03-28 22:28:03 +01:00
Matteo Scaramuccia
fe104762c9 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-03-28 22:22:19 +01:00
Dan Marsden
1de23b7fdc MDL-38715 SCORM fix missing calls to setType and remove old call to setMaxFileSize 2013-03-28 12:38:27 +13:00
Matteo Scaramuccia
724dc929c7 MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:02:41 +01:00
Ankit Agarwal
6e9d3c19e3 MDL-38370 scorm: Fixing strict standard errors in outline report 2013-03-12 11:43:10 +08:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Dan Poltawski
61df003d53 Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle 2013-02-19 15:04:56 +08:00
Dan Poltawski
fd507a8715 Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle 2013-02-19 13:41:45 +08:00
Dan Marsden
61fbdb0eec MDL-37660 SCORM: move time related settings into general section and improve lang 2013-02-15 23:48:32 +13:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
Matteo Scaramuccia
f1e316870d MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918) 2013-02-14 21:38:05 +01:00
Dan Marsden
a022192a3b MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:04:06 +13:00
Dan Marsden
361069cbbb MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better. 2013-02-03 20:27:52 +13:00
Dan Marsden
5f03868a53 MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors 2013-02-03 20:27:39 +13:00
Dan Marsden
6496979459 MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix 2013-02-03 20:21:16 +13:00
Dan Poltawski
2c8d31cd72 Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle 2013-01-31 10:14:46 +08:00
Dan Marsden
220e5b5216 MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt. 2013-01-31 10:45:11 +13:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
2013-01-29 22:34:46 +01:00
Sam Hemelryk
dabe6985e4 Merge branch 'master_MDL-37696' of git://github.com/danmarsden/moodle 2013-01-29 10:19:31 +13:00
Dan Marsden
cce0da745a MDL-34231 SCORM: Lock after final attempt when using skip content structure or direct navigation to player.php 2013-01-28 21:17:43 +13:00
Dan Marsden
fe56bc615d MDL-37696 SCORM css: don't include style.css multiple times 2013-01-28 10:31:08 +13:00
Dan Poltawski
cba645b850 Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle 2013-01-22 12:49:18 +08:00
Dan Poltawski
3be10301e9 Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle 2013-01-21 09:01:00 +08:00
Ben Johnson
7536464d61 MDL-36421 SCORM: fix SCORM course format new window popups 2013-01-15 21:42:56 +13:00
Sam Hemelryk
c2e2da2e69 Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle 2013-01-14 11:46:13 +13:00
Dan Marsden
7b63805531 MDL-37394 SCORM: Aicc direct url fails with new nav as it has a single sco with no children - allow these to be navigated correctly. 2013-01-11 23:45:23 +13:00
Dan Marsden
3c44304276 MDL-36853 SCORM: get first valid sco instead of array of scos - thanks to Jamie Smith for the fix - fixes PHP warnings when returning to an existing attempt. 2013-01-11 19:47:55 +13:00
Sam Hemelryk
f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00
Ankit Agarwal
40652808e3 MDL-36855 scorm: update to api get_scorm_question_count()
get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student
2013-01-03 14:40:36 +08:00
Petr Škoda
75427a824c MDL-37171 fix multiple spreadsheet related PHP4isms 2012-12-15 12:36:40 +01:00
Dan Poltawski
7ac94cab86 Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle 2012-12-12 08:43:29 +08:00
Eloy Lafuente (stronk7)
4ad65dc2b6 Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle 2012-12-11 22:42:09 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
fa18df40c1 Merge branch 'MDL-36828' of https://github.com/aolley/moodle 2012-12-11 11:44:11 +08:00
Eloy Lafuente (stronk7)
663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Aparup Banerjee
8e1fbc0fe6 Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle 2012-11-29 12:53:25 +08:00