50186 Commits

Author SHA1 Message Date
Mark Nielsen
42dffc6feb MDL-29956: Implement common cartridge export (r16882) 2011-11-14 21:25:08 +01:00
David Mudrak
3319af85a9 MDL-29793 Advanced grading - do not execute the restore step if the grading.xml is missing 2011-11-14 21:11:41 +01:00
David Mudrak
c309e4f05e MDL-29793 Advanced grading backup - fixed the recently renamed DB field 2011-11-14 21:11:00 +01:00
Eloy Lafuente (stronk7)
98ca9e8480 MDL-27622 theme_mymobile: add it to core themes 2011-11-14 12:45:48 +01:00
Eloy Lafuente (stronk7)
8d78644bcc Merge branch 'lti' of git://github.com/scriby/moodle 2011-11-14 12:37:43 +01:00
Eloy Lafuente (stronk7)
6a7998f9a1 MDL-20534 lti: bump version and requires to current before integration, yay! 2011-11-14 12:35:52 +01:00
Sam Hemelryk
1ae9aa2b8f Merged MDL-29108 Advanced grading 2011-11-14 22:01:05 +13:00
David Mudrak
053d290c0d Merge pull request #25 from marinaglancy/wip-nov14-rubric 2011-11-14 00:20:16 -08:00
Dan Marsden
9a68ff24d2 MDL-27036 AICC HACP handling - add missing check for correct user with has_capability. 2011-11-14 21:20:14 +13:00
Marina Glancy
3c2b3cb3ee MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240 2011-11-14 14:53:14 +08:00
Marina Glancy
b1add93e47 MDL-30241: fixing Javascript to work in IE as well 2011-11-14 14:48:28 +08:00
Sam Hemelryk
364fe13b11 Merge branch 'MDL-28670' of git://github.com/nebgor/moodle 2011-11-14 17:49:47 +13:00
Aparup Banerjee
8887601196 MDL-28670 webservice : (review) changes improving performance 2011-11-14 11:25:36 +08:00
Sam Hemelryk
6335838604 Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle 2011-11-14 12:10:17 +13:00
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
6f07a6a2ea MDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid
As a response to Sam's review (7.4)
2011-11-13 14:07:33 +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)
cf2de1cf10 MDL-27622 theme_mymobile: whitespace fixes 2011-11-11 20:22:41 +01:00
Chris Scribner
42a2c7f16e MDL-20534 lti: A8. Removing locallib.php require from lib.php 2011-11-11 13:54:54 -05:00
Chris Scribner
2575332b86 MDL-20534 lti: Updating call to lti_add_instance with 2nd argument. 2011-11-11 13:47:53 -05:00
Chris Scribner
d00d058d55 MDL-20534 lti: Fixing some language in lti's index.php 2011-11-11 13:40:59 -05:00
Chris Scribner
78d52bf87c MDL-20534 lti: Getting rid of references to "Basic" LTI in language file 2011-11-11 13:34:24 -05:00
Chris Scribner
89b7bbe9ee MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing. 2011-11-11 13:31:09 -05:00
Eloy Lafuente (stronk7)
dddfaa73cb Merge branch 'MDL-30057' of git://github.com/stronk7/moodle 2011-11-11 15:47:33 +01:00
Darko Miletic
4febc0a013 Added Moodle 1.9 -> Moodle 2 converter 2011-11-11 08:31:34 -05:00
David Mudrak
c15b933c69 MDL-29108 Orphaned areas are excluded from search results
If for any reason the referenced context does not exist any more, the
forms defined in relevant areas are considered removed (even if their
records still exist in the database).
2011-11-11 14:16:17 +01:00
David Mudrak
a3b37e4b6e MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level 2011-11-11 13:59:04 +01:00
David Mudrak
1dea75b8d1 MDL-29108 Do not display grading method selector for non-privileged users
The patch checks the required capability before it displays the grading
method selectors in the modform.
2011-11-11 13:58:45 +01:00
Eloy Lafuente (stronk7)
0852418307 Merge branch 'MDL-29945' of git://github.com/timhunt/moodle 2011-11-11 12:54:11 +01:00
Tim Hunt
1dd21f4058 MDL-29945 incorrect logic when testing if a qtype can be uninstalled.
Thanks to Andrew Davis for catching this during testing.
2011-11-11 11:40:07 +00:00
David Mudrak
217116d414 MDL-29108 Improving get_grading_method() documentation
As a response to Sam's review (10)
2011-11-11 12:18:02 +01:00
David Mudrak
794cea253c MDL-29108 Fixing a typo
Spotted by Sam during the review (23)
2011-11-11 12:17:01 +01:00
David Mudrak
6f19a2a98b MDL-29108 Removing global variables where they are not needed
Spotted by Sam during the review (17.1 and 17.3)
2011-11-11 12:10:02 +01:00
Sam Hemelryk
e2b38d06cf MDL-27622 theme_mymobile: quick regression fix of var 2011-11-11 18:36:10 +13:00
Sam Hemelryk
025d304ad3 Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle 2011-11-11 18:35:13 +13:00
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