Commit graph

12403 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
da2e3c12db Merge branch 'MDL-30026' of git://github.com/stronk7/moodle 2011-11-13 19:35:13 +01:00
Eloy Lafuente (stronk7)
da3a1f3ae7 MDL-30026 improve session lock - stronger detection for oracle 2011-11-13 19:23:53 +01:00
Eloy Lafuente (stronk7)
d16b0197de MDL-30026 improve session lock - mssql workaround for bug with scalar returned values 2011-11-13 19:06:44 +01:00
Eloy Lafuente (stronk7)
12dfd6df01 MDL-30026 improve session lock - unit tests & minor comment fixup 2011-11-13 19:05:57 +01:00
David Mudrak
71ab436aa9 MDL-29108 Advanced grading - renaming DB fields formid to definitionid
As a response to Sam's review (7.1 and 7.3)
2011-11-13 14:03:38 +01:00
David Mudrak
9e32368b29 MDL-29108 Remove all associated grading areas when the context is being deleted 2011-11-13 13:50:00 +01:00
Eloy Lafuente (stronk7)
dddfaa73cb Merge branch 'MDL-30057' of git://github.com/stronk7/moodle 2011-11-11 15:47:33 +01:00
Eloy Lafuente (stronk7)
8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
2011-11-11 03:37:55 +01:00
Eloy Lafuente (stronk7)
d59df6582b Merge branch 'MDL-29808' of git://github.com/timhunt/moodle
Conflicts:
	question/type/upgrade.txt

There were already one just added upgrade.txt file so this ended
conflicting. Reviewed the contents, I've deleted the less detailed
note about pluginname, leaving the longer description added by Tim.

Ciao :-)
2011-11-10 21:54:36 +01:00
Eloy Lafuente (stronk7)
47c6991a8e Merge branch 'MDL-29945' of git://github.com/timhunt/moodle 2011-11-10 21:47:22 +01:00
Tim Hunt
226b312472 MDL-29808 qtypes: use standard pluginname strings and update version.php
AMOS BEGIN
 MOV [calculated,qtype_calculated],[pluginname,qtype_calculated]
 MOV [calculated_help,qtype_calculated],[pluginname_help,qtype_calculated]
 MOV [calculated_link,qtype_calculated],[pluginname_link,qtype_calculated]
 MOV [addingcalculated,qtype_calculated],[pluginnameadding,qtype_calculated]
 MOV [editingcalculated,qtype_calculated],[pluginnameediting,qtype_calculated]
 MOV [calculatedsummary,qtype_calculated],[pluginnamesummary,qtype_calculated]

 MOV [calculatedmulti,qtype_calculatedmulti],[pluginname,qtype_calculatedmulti]
 MOV [calculatedmulti_help,qtype_calculatedmulti],[pluginname_help,qtype_calculatedmulti]
 MOV [calculatedmulti_link,qtype_calculatedmulti],[pluginname_link,qtype_calculatedmulti]
 MOV [addingcalculatedmulti,qtype_calculatedmulti],[pluginnameadding,qtype_calculatedmulti]
 MOV [editingcalculatedmulti,qtype_calculatedmulti],[pluginnameediting,qtype_calculatedmulti]
 MOV [calculatedmultisummary,qtype_calculatedmulti],[pluginnamesummary,qtype_calculatedmulti]

 MOV [calculatedsimple,qtype_calculatedsimple],[pluginname,qtype_calculatedsimple]
 MOV [calculatedsimple_help,qtype_calculatedsimple],[pluginname_help,qtype_calculatedsimple]
 MOV [calculatedsimple_link,qtype_calculatedsimple],[pluginname_link,qtype_calculatedsimple]
 MOV [addingcalculatedsimple,qtype_calculatedsimple],[pluginnameadding,qtype_calculatedsimple]
 MOV [editingcalculatedsimple,qtype_calculatedsimple],[pluginnameediting,qtype_calculatedsimple]
 MOV [calculatedsimplesummary,qtype_calculatedsimple],[pluginnamesummary,qtype_calculatedsimple]

 MOV [description,qtype_description],[pluginname,qtype_description]
 MOV [description_help,qtype_description],[pluginname_help,qtype_description]
 MOV [addingdescription,qtype_description],[pluginnameadding,qtype_description]
 MOV [editingdescription,qtype_description],[pluginnameediting,qtype_description]
 MOV [descriptionsummary,qtype_description],[pluginnamesummary,qtype_description]

 MOV [essay,qtype_essay],[pluginname,qtype_essay]
 MOV [essay_help,qtype_essay],[pluginname_help,qtype_essay]
 MOV [essay_link,qtype_essay],[pluginname_link,qtype_essay]
 MOV [addingessay,qtype_essay],[pluginnameadding,qtype_essay]
 MOV [editingessay,qtype_essay],[pluginnameediting,qtype_essay]
 MOV [essaysummary,qtype_essay],[pluginnamesummary,qtype_essay]

 MOV [match,qtype_match],[pluginname,qtype_match]
 MOV [match_help,qtype_match],[pluginname_help,qtype_match]
 MOV [match_link,qtype_match],[pluginname_link,qtype_match]
 MOV [addingmatch,qtype_match],[pluginnameadding,qtype_match]
 MOV [editingmatch,qtype_match],[pluginnameediting,qtype_match]
 MOV [matchsummary,qtype_match],[pluginnamesummary,qtype_match]

 MOV [missingtype,qtype_missingtype],[pluginname,qtype_missingtype]
 MOV [addingmissingtype,qtype_missingtype],[pluginnameadding,qtype_missingtype]
 MOV [editingmissingtype,qtype_missingtype],[pluginnameediting,qtype_missingtype]

 MOV [multianswer,qtype_multianswer],[pluginname,qtype_multianswer]
 MOV [multianswer_help,qtype_multianswer],[pluginname_help,qtype_multianswer]
 MOV [multianswer_link,qtype_multianswer],[pluginname_link,qtype_multianswer]
 MOV [addingmultianswer,qtype_multianswer],[pluginnameadding,qtype_multianswer]
 MOV [editingmultianswer,qtype_multianswer],[pluginnameediting,qtype_multianswer]
 MOV [multianswersummary,qtype_multianswer],[pluginnamesummary,qtype_multianswer]

 MOV [multichoice,qtype_multichoice],[pluginname,qtype_multichoice]
 MOV [multichoice_help,qtype_multichoice],[pluginname_help,qtype_multichoice]
 MOV [multichoice_link,qtype_multichoice],[pluginname_link,qtype_multichoice]
 MOV [addingmultichoice,qtype_multichoice],[pluginnameadding,qtype_multichoice]
 MOV [editingmultichoice,qtype_multichoice],[pluginnameediting,qtype_multichoice]
 MOV [multichoicesummary,qtype_multichoice],[pluginnamesummary,qtype_multichoice]

 MOV [numerical,qtype_numerical],[pluginname,qtype_numerical]
 MOV [numerical_help,qtype_numerical],[pluginname_help,qtype_numerical]
 MOV [numerical_link,qtype_numerical],[pluginname_link,qtype_numerical]
 MOV [addingnumerical,qtype_numerical],[pluginnameadding,qtype_numerical]
 MOV [editingnumerical,qtype_numerical],[pluginnameediting,qtype_numerical]
 MOV [numericalsummary,qtype_numerical],[pluginnamesummary,qtype_numerical]

 MOV [random,qtype_random],[pluginname,qtype_random]
 MOV [random_help,qtype_random],[pluginname_help,qtype_random]
 MOV [editingrandom,qtype_random],[pluginnameediting,qtype_random]

 MOV [shortanswer,qtype_shortanswer],[pluginname,qtype_shortanswer]
 MOV [shortanswer_help,qtype_shortanswer],[pluginname_help,qtype_shortanswer]
 MOV [shortanswer_link,qtype_shortanswer],[pluginname_link,qtype_shortanswer]
 MOV [addingshortanswer,qtype_shortanswer],[pluginnameadding,qtype_shortanswer]
 MOV [editingshortanswer,qtype_shortanswer],[pluginnameediting,qtype_shortanswer]
 MOV [shortanswersummary,qtype_shortanswer],[pluginnamesummary,qtype_shortanswer]

 MOV [truefalse,qtype_truefalse],[pluginname,qtype_truefalse]
 MOV [truefalse_help,qtype_truefalse],[pluginname_help,qtype_truefalse]
 MOV [truefalse_link,qtype_truefalse],[pluginname_link,qtype_truefalse]
 MOV [addingtruefalse,qtype_truefalse],[pluginnameadding,qtype_truefalse]
 MOV [editingtruefalse,qtype_truefalse],[pluginnameediting,qtype_truefalse]
 MOV [truefalsesummary,qtype_truefalse],[pluginnamesummary,qtype_truefalse]
AMOS END
2011-11-10 19:12:30 +00:00
Tim Hunt
646791794d MDL-29808 qformats: use standard pluginname string and add version.php
AMOS BEGIN
 MOV [aiken,qformat_aiken],[pluginname,qformat_aiken]
 MOV [aiken_help,qformat_aiken],[pluginname_help,qformat_aiken]
 MOV [aiken_link,qformat_aiken],[pluginname_link,qformat_aiken]
 MOV [blackboard,qformat_blackboard],[pluginname,qformat_blackboard]
 MOV [blackboard_help,qformat_blackboard],[pluginname_help,qformat_blackboard]
 MOV [blackboard_six,qformat_blackboard_six],[pluginname,qformat_blackboard_six]
 MOV [blackboard_six_help,qformat_blackboard_six],[pluginname_help,qformat_blackboard_six]
 MOV [examview,qformat_examview],[pluginname,qformat_examview]
 MOV [examview_help,qformat_examview],[pluginname_help,qformat_examview]
 MOV [gift_help,qformat_gift],[pluginname_help,qformat_gift]
 MOV [gift_link,qformat_gift],[pluginname_link,qformat_gift]
 MOV [learnwise,qformat_learnwise],[pluginname,qformat_learnwise]
 MOV [learnwise_help,qformat_learnwise],[pluginname_help,qformat_learnwise]
 MOV [missingword,qformat_missingword],[pluginname,qformat_missingword]
 MOV [missingword_help,qformat_missingword],[pluginname_help,qformat_missingword]
 MOV [missingword_link,qformat_missingword],[pluginname_link,qformat_missingword]
 MOV [multianswer,qformat_multianswer],[pluginname,qformat_multianswer]
 MOV [multianswer_help,qformat_multianswer],[pluginname_help,qformat_multianswer]
 MOV [multianswer_link,qformat_multianswer],[pluginname_link,qformat_multianswer]
 MOV [webct_help,qformat_webct],[pluginname_help,qformat_webct]
 MOV [webct_link,qformat_webct],[pluginname_link,qformat_webct]
 MOV [xhtml,qformat_xhtml],[pluginname,qformat_xhtml]
 MOV [xhtml_help,qformat_xhtml],[pluginname_help,qformat_xhtml]
 MOV [xhtml_link,qformat_xhtml],[pluginname_link,qformat_xhtml]
 MOV [xml_help,qformat_xml],[pluginname_help,qformat_xml]
 MOV [xml_link,qformat_xml],[pluginname_link,qformat_xml]
AMOS END
2011-11-10 19:12:28 +00:00
Tim Hunt
75a31c9039 MDL-29808 qbehaviours: update to use ->dependencies in version.php 2011-11-10 19:12:25 +00:00
Tim Hunt
828788f03b MDL-29945 plugin management: don't show Uninstall links for required plugins. 2011-11-10 19:11:24 +00:00
Eloy Lafuente (stronk7)
8f1a0d21cb MDL-28277 scorm report - set interaction as standard + version component 2011-11-10 16:55:54 +01:00
Eloy Lafuente (stronk7)
d64cb2fb73 Merge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle 2011-11-09 23:47:01 +01:00
Sam Hemelryk
e3dfd1a1d9 Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution 2011-11-10 10:15:50 +13:00
David Mudrak
241d9463de MDL-29798 Final clean-up before submitting for the integration review 2011-11-09 22:08:09 +01:00
Sam Hemelryk
7d99144e83 Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle 2011-11-10 09:41:38 +13:00
Eloy Lafuente (stronk7)
ff64599f25 Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle 2011-11-09 16:35:57 +01:00
Sun Zhigang
29a9ba9130 MDL-29656 Fix bad string reference 2011-11-09 16:47:16 +08:00
Aparup Banerjee
5b653c75dd Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle 2011-11-09 11:05:32 +08:00
Aparup Banerjee
5d788e38ff MDL-30154 Repositories : fixed whitespace. 2011-11-08 11:29:31 +08:00
Aparup Banerjee
7a3a8fd0c5 Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle 2011-11-08 11:15:01 +08:00
Eloy Lafuente (stronk7)
7fdee5b643 MDL-20534 lti: add component and set lti module as core one 2011-11-08 00:55:59 +01:00
Eloy Lafuente (stronk7)
5e1f727df7 MDL-20534 lti: B3, revert old outputlib hack for external icons 2011-11-07 23:35:58 +01:00
Sam Hemelryk
daa1ed26cf Merge branch 'MDL-30175' of git://github.com/stronk7/moodle 2011-11-08 10:57:54 +13:00
Eloy Lafuente (stronk7)
c443a1cdb6 MDL-30175 cm_info - add support to external url icon images 2011-11-07 22:14:13 +01:00
Jason Fowler
483239087c MDL24200 - Admin Users - Changing the submit button to just a button to prevent it from taking focus when entering text. (Patch provided by Hubert Chathi) 2011-11-07 15:29:11 +08:00
Chris Scribner
c07aec164f Implementing custom LTI icon support 2011-11-06 20:41:57 -05:00
Sam Hemelryk
a86529bdeb MDL-29864 minify: Added a link to upstream issue being patched 2011-11-07 12:19:57 +13:00
Sam Hemelryk
a82a42b6c1 Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle 2011-11-07 11:58:44 +13:00
Sam Hemelryk
0abe89f7b4 Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle 2011-11-07 11:41:31 +13:00
Andreas Grabs
6543f3cd5b MDL-30154 - WebDAV-Repository fails on some WebDAV-Server 2011-11-06 22:09:11 +01:00
Mary Evans
afc7026a57 MDL-30010FIX for pagelayout problems when moving blocks 2011-11-06 19:48:10 +00:00
Petr Skoda
2b0e3941e9 MDL-30026 improve session lock acquire timeouts and other minor cleanup
This is partially based on original patch by Tony Levi.
2011-11-06 17:52:15 +01:00
Petr Skoda
4f6bba205d MDL-29030 add report management UI 2011-11-06 12:51:48 +01:00
Petr Skoda
beda8fa8e2 MDL-29030 move user stats reporting to report_stats plugin 2011-11-06 12:22:52 +01:00
Petr Skoda
fad8e0248c MDL-29030 move user log reporting to report_log plugin 2011-11-06 12:22:52 +01:00
Petr Skoda
4d00fded9d MDL-29030 migrate outline user reporting to plugin 2011-11-06 12:22:51 +01:00
Petr Skoda
ba50bd3d63 MDL-29030 fix remaining report linking hacks
Please note all plugin references from core should use callbacks, it is not ok to use capabilities or links to plugins because they may not be present in customised installs.
2011-11-06 12:22:50 +01:00
Petr Skoda
a2a444ab75 MDL-29030 migration and cleanup of stats report
AMOS BEGIN
 MOV [pluginpagetype,coursereport_stats],[pluginpagetype,report_stats]
 MOV [stats:view,coursereport_stats],[stats:view,report_stats]
AMOS END
2011-11-06 12:22:49 +01:00
Petr Skoda
8a8f29c2f5 MDL-29030 new loglive report plugin
AMOS BEGIN
 CPY [log:viewlive,coursereport_log,[loglive:view,report_loglive]
 MOV [livelogs,core],[livelogs,report_loglive]
 CPY [loglive,coursereport_log],[pluginname,report_loglive]
AMOS END
2011-11-06 12:22:49 +01:00
Petr Skoda
3afce1a574 MDL-29030 convert participation report to new report type
AMOS BEGIN
 MOV [participation:view,coursereport_participation],[participation:view,report_participation]
 MOV [pluginpagetype,coursereport_participation],[pluginpagetype,report_participation]
 MOV [pluginname,coursereport_participation],[pluginname,report_participation]
AMOS END
2011-11-06 12:22:48 +01:00
Petr Skoda
8619857d5f MDL-29030 migrate progress report to new type
AMOS BEGIN
 MOV [pluginname,coursereport_progress],[pluginname,report_progress]
 MOV [pluginpagetype,coursereport_progress],[pluginpagetype,report_progress]
 MOV [progress:view,coursereport_progress],[progress:view,report_progress]
AMOS END
2011-11-06 12:22:48 +01:00
Petr Skoda
13fdaaacc3 MDL-29030 migrate completion report to new report type
AMOS BEGIN
 MOV [completion:view,coursereport_completion],[completion:view,report_completion]
 MOV [completiondate,coursereport_completion],[completiondate,report_completion]
 MOV [pluginpagetype,coursereport_completion],[pluginpagetype,report_completion]
 MOV [pluginname,coursereport_completion],[pluginname,report_completion]
AMOS END
2011-11-06 12:22:47 +01:00
Petr Skoda
275cbac71a MDL-29030 migrate outline report to new type
AMOS BEGIN
 MOV [outline:view,coursereport_outline],[outline:view,report_outline]
 MOV [pluginpagetype,coursereport_outline],[pluginpagetype,report_outline]
 MOV [pluginname,coursereport_outline],[pluginname,report_outline]
AMOS END
2011-11-06 12:22:47 +01:00
Petr Skoda
e30cc24c0d MDL-29030 make admin reports general reports
AMOS BEGIN
 CPY [pluginname,coursereport_log],[pluginname,report_log]
 CPY [pluginname,coursereport_stats],[pluginname,report_stats]
AMOS END
2011-11-06 12:22:45 +01:00
Petr Skoda
2a1ce6a8ed MDL-30150 support frankenstyle in page type callbacks 2011-11-06 11:32:12 +01:00
Petr Skoda
bbfdff344c MDL-30131 improve current user enrol caching 2011-11-06 09:40:06 +01:00