L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,029 Commits 38 Branches 564 Tags
2ded89d564a94deefa8945cefffa2a83bf1e56bf
Commit Graph

68 Commits

Author SHA1 Message Date
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 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
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 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
Tim Hunt 88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
Dan Marsden 8aba9cda72 MDL-31652 SCORM - hide updatefreq setting and remove it if not required. 2012-02-16 12:16:02 +13:00
Dan Marsden 1a50148e8b MDL-28728 SCORM Add missing string 2011-12-16 11:22:39 +13:00
Dan Marsden d32e353e35 MDL-28728 SCORM - add capability to allow users to delete own attempts - given to no-one by default. 2011-12-11 19:10:28 +13:00
Eloy Lafuente (stronk7) 0a9ed36c9e Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle 2011-11-09 02:13:38 +01:00
Eloy Lafuente (stronk7) ec25a72c4d Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle 2011-11-09 02:03:25 +01:00
Dan Marsden 3cfffd8c3e SCORM MDL-27036 increase sessid, improve lang strings 2011-11-07 14:34:13 +13:00
Dan Marsden 4388bd45b2 SCORM MDL-30146 AICC - add ability to link direct to a simple AICC url 2011-11-05 21:51:24 +13:00
Dan Marsden ba0e91a281 SCORM MDL-27036 enable AICC HACP 2011-11-05 20:31:01 +13:00
Dan Marsden 2f717fcc20 SCORM MDL-30041 fix case of string 2011-11-02 09:42:29 +13:00
Ankit Kumar Agarwal 266a129c14 MDL-27624 Small structural changes 
MDL-27624 SCORM adding definition to scrom elements
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/userreport.php
 2011-08-19 11:17:19 +12:00
Dan Marsden 03c3488957 MDL-28311 SCORM tidy up php warnings and display warning message to teacher that their manifest is invalid 2011-08-04 11:08:42 +12:00
Dan Marsden 04c99f8cdf MDL-28535 SCORM remove old IE 6 related warning about zlib 2011-07-30 10:38:55 +12:00
Petr Skoda 99e8656170 MDL-28441 add scormreport_basic to the list of standard plugins 2011-07-23 13:04:23 +02:00
Petr Skoda d6a1c91bee Merge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle 2011-07-18 15:58:59 +02:00
Dan Marsden 99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden b2614417a5 MDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin is installed, move delete attempts code into plugin as it may not be supported in all plugins, general tidy up - good work Ankit! 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal 62b82cbcff MDL27522 First version Push 
modified:   mod/scorm/report.php
	new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
	modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
	new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

	deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
	new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/basic/version.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
	modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php

	modified:   mod/scorm/db/install.xml
	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php
 2011-07-14 10:57:29 +12:00
Eloy Lafuente (stronk7) dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
 2011-07-12 16:28:36 +02:00
Dan Marsden 6eca9e1c63 MDL-28017 SCORM - remove admin setting incorrectly added as it was never used. 2011-07-11 15:42:53 +12:00
Dan Marsden 3c0b04c440 MDL-28109 - allow admin to decide which scorm settings are advanced, tidy up order of settings 2011-07-11 10:18:16 +12:00
Dan Marsden 0ffaa76be3 MDL-28109 - allow adming to decide which scorm settings are advanced, tidy up order of settings 2011-07-10 11:10:56 +12:00
Dan Marsden d9306a9c1f SCORM MDL-28110 fix string name 2011-07-03 12:51:56 +12:00
Dan Marsden 0ab985f918 SCORM MDL-28110 set default for forcejavascript to yes - add string explaining what it does. 2011-07-03 12:51:56 +12:00
Dan Marsden f7b5c6aae6 SCORM MDL-28111 tidy up formatting of code 2011-07-03 12:49:29 +12:00
Eloy Lafuente (stronk7) 715a5bb732 MDL-27829 blocks - lang string fixes. Credit goes to Helen! 2011-07-01 20:38:06 +02:00
Dongsheng Cai b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly 
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
 2011-06-09 13:51:14 +08:00
Dan Marsden db1f94ce4e MDL-26201 fix Lang - Thanks Petr 2011-02-02 09:23:24 +01:00
Eloy Lafuente (stronk7) 8e1ad9c60f Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle 2011-01-31 19:14:55 +01:00
Dan Marsden 30bce58eb9 SCORM MDL-26201 setting to allow admin to force users to enable JS in their browser before allowing them to view/use SCORM objects. 2011-01-31 16:53:10 +13:00
Dan Marsden 39340358b4 MDL-26176 - cleanup garbage/pointless code 2011-01-29 21:27:12 +13:00
Helen Foster f705b4347a MDL-21250 capital letters removal 2010-12-02 18:22:19 +00:00
David Mudrak 370d793c98 MDL-23318 Consistent usage of 'pluginadministration' string for the Settings block 
AMOS BEGIN
 MOV [assignmentadministration,mod_assignment],[pluginadministration,mod_assignment]
 MOV [dataadministration,mod_data],[pluginadministration,mod_data]
 MOV [feedbackadministration,mod_feedback],[pluginadministration,mod_feedback]
 MOV [folderadministration,mod_folder],[pluginadministration,mod_folder]
 MOV [forumadministration,mod_forum],[pluginadministration,mod_forum]
 MOV [glossaryadministration,mod_glossary],[pluginadministration,mod_glossary]
 MOV [chatadministration,mod_chat],[pluginadministration,mod_chat]
 MOV [choiceadministration,mod_choice],[pluginadministration,mod_choice]
 MOV [imscpadministration,mod_imscp],[pluginadministration,mod_imscp]
 MOV [labeladministration,mod_label],[pluginadministration,mod_label]
 MOV [lessonadministration,mod_lesson],[pluginadministration,mod_lesson]
 MOV [pageadministration,mod_page],[pluginadministration,mod_page]
 MOV [quizadministration,mod_quiz],[pluginadministration,mod_quiz]
 MOV [resourceadministration,mod_resource],[pluginadministration,mod_resource]
 MOV [scormadministration,mod_scorm],[pluginadministration,mod_scorm]
 MOV [surveyadministration,mod_survey],[pluginadministration,mod_survey]
 MOV [urladministration,mod_url],[pluginadministration,mod_url]
 MOV [wikiadministration,mod_wiki],[pluginadministration,mod_wiki]
 MOV [workshopadministration,mod_workshop],[pluginadministration,mod_workshop]
AMOS END
 2010-08-17 17:35:12 +00:00
Dan Marsden 31845fcdd1 SCORM MDL-22951 - remove old string - uses new JS to provide errors on pop-ups 2010-07-25 23:47:33 +00:00
Piers Harding fe3b9da3fa MDL-22951 - do popup blocking detection, and fix double open on popup 2010-07-25 22:54:29 +00:00
Dan Marsden b1ca5d31dc SCORM MDL-23492 tidy up grading method display/calculation 2010-07-23 09:23:52 +00:00
Dan Marsden 5d21c26076 SCORM MDL-21333 remove link to allow manual opening of window as JS communication can fail and no grades are reported from the object. Remove old strings no longer required. 2010-07-22 01:52:25 +00:00
Dan Marsden 5c2aa1574f SCORM MDL-22951 New player for SCORM fixes major regression that prevents some SCORM objects from playing - MDL-23454 - also fixes MDL-19954, MDL-7787, MDL-19618, MDL-23421 - this still has a some issues with the display of objects in IE 7 but these are minor compared to the regression in MDL-23454 and should be resolved very soon. 2010-07-22 00:48:06 +00:00
Dan Marsden d67eb43486 SCORM MDL-17702 iframe no longer used - rename string and remove old string no longer used. 2010-07-09 08:40:54 +00:00
Martin Dougiamas 9a5b90053b MDL-22056 Adding pluginname to activity modules to fix gradebook issues caused by MDL-23071 (keeping modulename for n) 
AMOS BEGIN
 CPY [modulename,assignment],[pluginname,assignment]
 CPY [modulename,chat],[pluginname,chat]
 CPY [modulename,choice],[pluginname,choice]
 CPY [modulename,data],[pluginname,data]
 CPY [modulename,feedback],[pluginname,feedback]
 CPY [modulename,folder],[pluginname,folder]
 CPY [modulename,forum],[pluginname,forum]
 CPY [modulename,glossary],[pluginname,glossary]
 CPY [modulename,hotpot],[pluginname,hotpot]
 CPY [modulename,imscp],[pluginname,imscp]
 CPY [modulename,label],[pluginname,label]
 CPY [modulename,lesson],[pluginname,lesson]
 CPY [modulename,page],[pluginname,page]
 CPY [modulename,quiz],[pluginname,quiz]
 CPY [modulename,resource],[pluginname,resource]
 CPY [modulename,survey],[pluginname,survey]
 CPY [modulename,url],[pluginname,url]
 CPY [modulename,wiki],[pluginname,wiki]
 CPY [modulename,workshop],[pluginname,workshop]
AMOS END
 2010-07-05 05:12:39 +00:00
Dan Marsden 624bcb1606 SCORM MDL-21989 improved english string to state that some browsers may prevent these settings. 2010-07-05 00:35:46 +00:00
Dan Marsden fd6a6947c3 SCORM MDL-18364 typo 2 - think it's finally right! 2010-06-28 01:06:40 +00:00