Commit graph

56894 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
dc5957d568 Merge branch 'MDL-37775_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2013-02-05 00:57:40 +01:00
Eloy Lafuente (stronk7)
da46d05239 Merge branch 'MDL-37785_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2013-02-05 00:36:24 +01:00
Eloy Lafuente (stronk7)
93f09e3ba8 Merge branch 'MDL-37523_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE 2013-02-05 00:28:41 +01:00
Eloy Lafuente (stronk7)
34c5ea24f3 Merge branch 'MDL-37847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-02-04 22:56:24 +01:00
Tim Hunt
53291c7256 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 13:08:26 +00:00
Mary Evans
fe24496193 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-04 11:40:29 +00:00
Damyon Wiese
e20455a5ae Merge branch 'MDL-37781-workshop-schedule_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2013-02-04 16:19:51 +08:00
Dan Poltawski
7c67ab3c14 Merge branch 'MDL-37574-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-02-04 16:14:22 +08:00
Dan Poltawski
32a579e30b Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"
This reverts commit f5eaec8646.
2013-02-04 15:13:00 +08:00
Dan Poltawski
b4f52cf9af Merge branch 'MDL-32076_unlimited2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-02-04 14:31:01 +08:00
Michael Hughes
ac3fe66f06 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-04 13:55:38 +08:00
Dan Poltawski
1a5f2cf058 Merge branch 'MDL-37646-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-02-04 13:49:42 +08:00
Dan Poltawski
6f4c3571b8 Merge branch 'MDL-37635-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-02-04 11:57:25 +08:00
Dan Poltawski
567fdbfa33 Merge branch 'MDL-37746_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-02-04 10:17:56 +08:00
Dan Poltawski
1a305ff1b9 Merge branch 'MDL-25853-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2013-02-04 10:14:07 +08:00
Andrew Robert Nicols
8e3b8a617d MDL-37574 Remove default link title from navigation items 2013-02-01 11:35:00 +00:00
Andrew Robert Nicols
ce8cde8b45 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:26:43 +00:00
Andreas Grabs
c962e3f112 MDL-37800 mod_feedback - item "information" does not appear correctly 2013-02-01 11:40:11 +01:00
Damyon Wiese
7d054079c5 MDL-37635 Assign: Prevent errors when viewing a feedback when there is no grade_item in the gradebook 2013-02-01 13:44:46 +08:00
Andrew Davis
4e6cffa180 MDL-37357 core_grade: fixed the showing and hiding of rank on the overview report 2013-02-01 10:54:47 +08:00
Andrew Davis
f5eaec8646 MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests 2013-02-01 08:52:30 +08:00
Tim Hunt
24ed210069 MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers.
When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.
2013-01-31 11:33:02 +00:00
David Mudrák
5e5dfabd4a MDL-37781 Allocate workshop submissions without waiting for cron
Now we are checking for the need to execute the allocator every time the
main view.php is displayed to any user. Previously this was done by cron
only.
2013-01-31 11:35:07 +01:00
David Mudrák
4ab0bf0f31 MDL-37781 Check for switching the workshop phase without waiting for cron
Now we are checking for the need to switch the phase when the main
view.php is displayed to any user (previously this was done via cron
only). To give our subplugins (such as the scheduled allocation method)
a chance to do what they need to do, the workshop_viewed event is
triggered before the phase is actually switched.
2013-01-31 11:33:45 +01:00
Eloy Lafuente (stronk7)
5e3412d94d weekly release 2.3.4+ 2013-01-31 11:04:15 +01:00
Mary Evans
31235aa431 MDL-37775 theme_canvas: Changed ADD a block from center align to left in style/blocks.css 2013-01-31 08:28:41 +00:00
Dan Poltawski
e17b0a6a8c Merge branch 'm23_MDL-34231' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2013-01-31 10:15:00 +08:00
Mary Evans
533064b86a MDL-37785 theme_base: remove duplicate .dir-rtl file-picker css rules from styke/core.css 2013-01-31 01:22:27 +00:00
Dan Marsden
8bdac11f11 MDL-34231 SCORM: use correct calculation of attemptsleft 2013-01-31 11:12:43 +13:00
Sam Hemelryk
07f3c79dd4 Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-01-31 08:45:32 +13:00
Andrew Davis
db30e0b00a MDL-13805 core_message: fixed some problems caused by a hasty backport 2013-01-30 18:34:02 +08:00
Frederic Massart
8a2c41aa28 MDL-25853 calendar: Fixed broken previous/next links 2013-01-30 09:02:51 +08:00
Eloy Lafuente (stronk7)
2cc9648555 Merge branch 'w04_MDL-37734_m23_marshack' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2013-01-30 01:23:44 +01:00
Petr Škoda
06ffb6544b MDL-37767 allow empty host in enrol_database which is required for default pg socket 2013-01-30 00:57:26 +01:00
Eloy Lafuente (stronk7)
6e607d44c0 Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-01-29 15:35:20 +01:00
Petr Škoda
9834ef146e MDL-37734 add one more recordset isolation test 2013-01-29 10:19:58 +01:00
Petr Škoda
1d65791467 MDL-37734 use prefetching workaround for MARS transaction problems 2013-01-29 10:19:51 +01:00
Rajesh Taneja
aebbfda077 MDL-34190 Course: Role with student archtype should be selected as default in user list 2013-01-29 16:54:17 +08:00
ppichet
b05659dde4 MDL-29691 Improve numerical format in multianswer
Allow the use of , as decsep in multianswer numerical subquestions
2013-01-29 16:30:36 +08:00
Damyon Wiese
86cc12d5f3 MDL-37646 Assign: Quickgrading fix when using grading filters or lots of students. 2013-01-29 14:43:34 +08:00
Dan Poltawski
87db6e272e Merge branch 'MDL-37694_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-29 11:54:51 +08:00
Sam Hemelryk
7b86ac4bbc Merge branch 'MDL-37476-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2013-01-29 15:23:35 +13:00
Dan Marsden
9e9b69fff9 MDL-37696 SCORM css: don't include style.css multiple times 2013-01-29 10:34:40 +13:00
Sam Hemelryk
09a8ba4aa6 Merge branch 'MDL-37697-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 09:02:32 +13:00
Sam Hemelryk
c5b346dc13 Merge branch 'MDL-37350-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:54:42 +13:00
Sam Hemelryk
3134895c01 Merge branch 'MDL-36881-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:51:20 +13:00
Sam Hemelryk
8108e113b3 Merge branch 'MDL-34671-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-29 08:39:08 +13:00
Sam Hemelryk
04093db18a Merge branch 'MDL-37668-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-01-29 08:33:01 +13:00
Sam Hemelryk
adf01e854b Merge branch 'm23_MDL-34321' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2013-01-29 08:27:23 +13:00
sam marshall
9fb8d1f275 MDL-37668 Accessibility: Help popup should be easy to close using keyboard 2013-01-28 10:57:42 +00:00