1289 Commits

Author SHA1 Message Date
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
Dan Marsden
be2d2f6d73 MDL-36858 SCORM: improve lang help for attempts grading to warn about failed status. 2012-11-28 20:54:50 +13:00
Matteo Scaramuccia
f833171fd1 MDL-36641 Missing HTTP check when using an external resource 2012-11-26 07:43:17 +01:00
Adam Olley
d684074114 MDL-36828: mod_scorm: Allow deletion of scorm modules if no scorm_scoes data exists 2012-11-26 15:30:49 +10:30
Sam Hemelryk
f1a90cc4fe Merge branch 'master_MDL-36772' of git://github.com/danmarsden/moodle 2012-11-26 10:24:42 +13:00
Dan Marsden
ca9ee2d0eb MDL-36772 SCORM add boilerplate and remove <!-- as it cause jscache to crash and burn. 2012-11-23 20:20:46 +13:00
Petr Škoda
40b9c0694c MDL-36436 use hacky aspect ratio to work around IE9 issues 2012-11-20 13:01:27 +01:00
Dan Poltawski
109473368d Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle 2012-11-20 15:57:53 +08:00
Dan Poltawski
1d907ae61e Merge branch 'master_MDL-36168' of git://github.com/danmarsden/moodle 2012-11-20 12:38:23 +08:00
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Dan Marsden
a82c1ad05a MDL-36467 SCORM: remove old debugging superceded by full scorm debugger 2012-11-13 09:02:43 +13:00
Dan Poltawski
90a23f067c Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/standard/style/course.css
2012-11-06 14:58:49 +08:00
Barbara Ramiro
2df53c3ed8 MDL-36277 Usability: New Activity icons in SVG and PNG formats 2012-11-06 00:02:31 +08:00
Sam Hemelryk
1385f1d8fb Merge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle 2012-11-05 15:07:21 +13:00
Dan Marsden
db7f1ca70e MDL-35737 SCORM: when scorm_parse is called and external scorm manifest use always update the package. 2012-10-26 15:13:39 +13:00
Dan Marsden
6977d5253b MDL-36168 SCORM: fix reset of course completion settings. 2012-10-25 17:12:52 +13:00
Matteo Scaramuccia
4704e6f80b MDL-36142 Incorrect SQL query (wrong usare of quotes) returns HTTP 404 due to a dml_read_exception 2012-10-19 22:36:26 +02:00
Aaron Barnes
01259692ef MDL-36107 scorm: Fix non-static method call 2012-10-19 18:39:45 +13:00
Sam Hemelryk
2ea4312a23 MDL-31683 mod_assign: Fixed up whitespace and cap check changes as required 2012-10-17 11:17:53 +08:00
Dan Poltawski
f186ad1f90 Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle 2012-10-15 17:19:44 +08:00