Commit graph

58980 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b97d3e46df Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle 2013-02-05 01:28:35 +01:00
Eloy Lafuente (stronk7)
b7c238798c Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle 2013-02-05 01:14:07 +01:00
Eloy Lafuente (stronk7)
1df33d5427 Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle 2013-02-05 01:06:40 +01:00
Eloy Lafuente (stronk7)
70e963ea9c Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle 2013-02-05 01:01:14 +01:00
Eloy Lafuente (stronk7)
fc395e02f7 Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:57:20 +01:00
Eloy Lafuente (stronk7)
a0c3faeaef Merge branch 'MDL-37785_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:35:24 +01:00
Eloy Lafuente (stronk7)
f941a7864b Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle 2013-02-05 00:28:10 +01:00
Eloy Lafuente (stronk7)
208f59137a Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle 2013-02-05 00:13:48 +01:00
Eloy Lafuente (stronk7)
1615caae6f Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle 2013-02-05 00:08:44 +01:00
Eloy Lafuente (stronk7)
8d8f9cf756 Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle 2013-02-04 23:58:41 +01:00
Eloy Lafuente (stronk7)
a35a7644b9 Merge branch 'MDL-37847' of git://github.com/timhunt/moodle 2013-02-04 22:54:50 +01:00
Tim Hunt
c0d12fc1cd MDL-37847 plain text essays were screwing up HTML special chars.
This was incorrect use of PARAM_CLEANHTML for these inputs.

This fix also adds some unit tests to try to verify that this does not
break again in future.
2013-02-04 12:54:10 +00: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
Damyon Wiese
935ec5e77e Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle 2013-02-04 16:18:00 +08:00
Dan Poltawski
78b161d39b Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle 2013-02-04 16:11:11 +08:00
Dan Poltawski
58e22287a6 Merge branch 'MDL-37422' of git://github.com/colchambers/moodle 2013-02-04 16:02:57 +08:00
Dan Poltawski
6ac9f15969 Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle 2013-02-04 15:54:43 +08:00
Dan Poltawski
efd779c2c6 Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"
This reverts commit 88df34abed.
2013-02-04 15:12:30 +08:00
Dan Poltawski
5389bd999d Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle 2013-02-04 14:30:07 +08:00
Dan Poltawski
cf936fa297 Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-04 13:54:27 +08:00
Dan Poltawski
4ac341c9b6 Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle 2013-02-04 13:49:23 +08:00
Jason Fowler
3246648b48 MDL-35847 - Accessibility - Adding warning icon to the login error message 2013-02-04 12:49:21 +08:00
Barbara Ramiro
ef27582f08 MDL-35847 - Usability - Adding new warning icons 2013-02-04 12:49:02 +08:00
Damyon Wiese
c15cda6138 Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle 2013-02-04 12:48:42 +08:00
Dan Poltawski
d5a13bca09 Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle 2013-02-04 12:12:11 +08:00
Dan Poltawski
b9299c61ca Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle 2013-02-04 11:56:45 +08:00
Mark Nelson
df7d171fc3 MDL-37518 blocks: described the introduction of the myaddinstance capability in upgrade.txt 2013-02-04 11:43:01 +08:00
Damyon Wiese
c04dac3473 Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle 2013-02-04 11:35:54 +08:00
Dan Poltawski
40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Dan Poltawski
7528ebd23a MDL-35823 - fix trailing whitespace 2013-02-04 11:23:44 +08:00
Dan Poltawski
3428c00d43 Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-04 11:23:41 +08:00
Damyon Wiese
ef23b6ff4f Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle 2013-02-04 11:12:45 +08:00
Dan Poltawski
7c433fa526 Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle 2013-02-04 10:26:32 +08:00
Dan Poltawski
e9c0ef3bca Merge branch 'MDL-37746' of git://github.com/timhunt/moodle 2013-02-04 10:17:36 +08:00
Dan Poltawski
85ef4d45ca Merge branch 'MDL-25853-master' of git://github.com/FMCorz/moodle 2013-02-04 10:12:54 +08:00
Mary Evans
1d4bfa094a MDL-37523 theme_mymobile: Removed a renderer from mymobile/renderers.php and added it to theme/mymobile/renderers/mod_choice_renderer.php. Then added a conditional statement to theme/mymobile/renderers.php in order to call mymobile/renderers/mod_choice_renderer.php. 2013-02-03 23:35:05 +00: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
Colin Chambers
6dbc346095 MDL-37422 Quiz: Group fields related to 'Settings for multiple tries.' 2013-02-01 14:30:27 +00:00
Andrew Robert Nicols
2f545feb89 MDL-37574 Remove default link title from navigation items 2013-02-01 11:30:02 +00:00
Andrew Robert Nicols
c1b75ece94 MDL-37566 AJAX Only set max-height for chooser dialogues
If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.

This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.
2013-02-01 11:21:47 +00:00
Andrew Robert Nicols
2324cf045e MDL-37645 Generalise style for moodle-core-dialogues 2013-02-01 10:20:16 +00:00
Michael Hughes
127d66f183 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-01 17:08:22 +08:00
Damyon Wiese
46692c3a81 MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook
Also adds unit tests to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability
2013-02-01 13:46:08 +08:00
Jason Fowler
4df8223cbe MDL-35823 - Accessibility - Converted the help popup header from H1 to H2 to improve the over all DOM 2013-02-01 11:01:00 +08:00
Andrew Davis
88df34abed MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-01 08:31:00 +08:00
David Mudrák
1df3bc143c MDL-37806 Display 'Save and show next' button when assessing workshop submissions
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.

AMOS BEGIN
 CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
2013-01-31 18:21:51 +01:00
David Mudrák
0001eea6dd MDL-37806 Add new workshop class method to return pending assessments
This is a simple wrapper around workshop::get_assessments_by_reviewer()
that filters assigned assessments and returns just those that were not
graded by the reviewer yet.
2013-01-31 18:21:50 +01:00
Davo Smith
56c0465bd4 MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore 2013-01-31 12:52:26 +00:00