49961 Commits

Author SHA1 Message Date
Aparup Banerjee
6cf8f401ba MDL-27037 wiki : fixed whitespace. 2011-11-11 13:28:46 +08:00
Mayank Gupta
dc0cabb488 MDL-27037, wiki does not support visiblegroups functionality 2011-11-11 13:28:41 +08:00
Aparup Banerjee
d48dae7507 Merge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle 2011-11-11 11:26:22 +08: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)
032bfca82a Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle 2011-11-11 02:42:40 +01:00
Eloy Lafuente (stronk7)
509361cfde Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)
2011-11-11 02:31:21 +01:00
Stephen Bourget
8c93ab4e0f MDL-29529 Assignment: Fix regression caused by MDL-27638 2011-11-11 01:23:47 +01:00
Eloy Lafuente (stronk7)
06b3d9c8c0 Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/canvas/style/course.css
2011-11-11 00:20:13 +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)
cff6d78a7b Merge branch 'MDL-30027' of git://github.com/mouneyrac/moodle 2011-11-10 01:58:57 +01:00
Eloy Lafuente (stronk7)
b01095d1e0 Merge branch 'MDL-30043' of git://github.com/mouneyrac/moodle 2011-11-10 01:49:56 +01:00
Eloy Lafuente (stronk7)
af85aa7bb6 Merge branch 'MDL-29931' of git://github.com/mouneyrac/moodle 2011-11-10 01:43:07 +01:00
Eloy Lafuente (stronk7)
9fc402e47d Merge branch 'MDL-28426' of git://github.com/timhunt/moodle 2011-11-10 01:32:01 +01:00
Eloy Lafuente (stronk7)
f3bf5eba51 Merge branch 'MDL-30145' of git://github.com/timhunt/moodle 2011-11-10 00:25:45 +01:00
Eloy Lafuente (stronk7)
3c37f0adbc Merge branch 'MDL-30158-master' of git://github.com/ankitagarwal/moodle 2011-11-10 00:22:13 +01:00
Eloy Lafuente (stronk7)
7ca578dea9 Merge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle 2011-11-09 23:59:02 +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
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
Eloy Lafuente (stronk7)
b5b99e0b7a NOBUG: Whitespace fixes 2011-11-09 16:32:30 +01:00
Eloy Lafuente (stronk7)
3fa5cb0bea Merge branch 'MDL-27542b' of git://github.com/rwijaya/moodle 2011-11-09 15:55:07 +01:00
Aparup Banerjee
b965ee236c Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle 2011-11-09 17:55:04 +08:00
Eloy Lafuente (stronk7)
c4bdf6b2d4 Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle 2011-11-09 10:05:40 +01:00
Sun Zhigang
29a9ba9130 MDL-29656 Fix bad string reference 2011-11-09 16:47:16 +08:00
Eloy Lafuente (stronk7)
7654b7bbc1 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 09:43:18 +01:00
Ankit Kumar Agarwal
f9ab70a908 MDL-28277 Changing optional_param to optional_param_array 2011-11-09 13:29:26 +05:30
Dan Poltawski
39b7715099 MDL-29696 mod/data - fixed page continuing after footer. 2011-11-09 15:42:07 +08:00
Sun Zhigang
81bb0556d9 MDL-29722 - No default guest enrol instance for requested courses 2011-11-09 15:20:00 +08:00
Aparup Banerjee
024f0f7374 Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle 2011-11-09 13:40:24 +08:00
Aparup Banerjee
92f6c2eb7f Merge branch 'MDL-30021' of git://github.com/timhunt/moodle 2011-11-09 12:19:20 +08:00
Aparup Banerjee
097ba12ba0 Merge branch 'MDL-29058' of git://github.com/timhunt/moodle 2011-11-09 11:29:45 +08:00
Dan Poltawski
2d7ad201ac MDL-29812 partcipiant report - breaks when filtering by user 2011-11-09 11:17:17 +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
Mary Evans
4db41cbdcf MDL-25511-theme_canvas tidy up CORE css files 2011-11-09 02:22:36 +00:00
Eloy Lafuente (stronk7)
b7830daba1 Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle 2011-11-09 02:20:26 +01: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
Eloy Lafuente (stronk7)
df087b865b Merge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle 2011-11-09 01:34:08 +01:00
Eloy Lafuente (stronk7)
e7ec46fc59 MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes 2011-11-09 01:30:51 +01:00
Eloy Lafuente (stronk7)
253b3231b9 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 01:20:06 +01:00
Dan Poltawski
c1733742c6 MDL-29803 report/logs - don't retrieve all users uncessarily
Also remove uncessary retrieval of idnumber

Helps display the main logs page on large sites without running out of
memory
2011-11-09 00:49:36 +01:00
Aparup Banerjee
98901d3ea9 Merge branch 'MDL-29739' of git://github.com/timhunt/moodle 2011-11-08 20:34:41 +08:00
Aparup Banerjee
3c905de59d Merge branch 'MDL-29970' of git://github.com/timhunt/moodle 2011-11-08 16:48:59 +08:00