70738 Commits

Author SHA1 Message Date
Damyon Wiese
99cc87e913 Merge branch '47077-28' of git://github.com/samhemelryk/moodle 2014-10-23 16:09:29 +08:00
Frederic Massart
67ba66e1d2 MDL-47762 gradereport_user: Hide contribution and weights when relevant
The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
2014-10-23 16:04:11 +08:00
Damyon Wiese
2fd07711e9 Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle 2014-10-23 15:47:10 +08:00
Marina Glancy
05599c47cb Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle 2014-10-23 15:45:54 +08:00
Marina Glancy
41d58f6f4c Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle 2014-10-23 15:42:46 +08:00
Damyon Wiese
3a3fe4bf37 Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle 2014-10-23 15:38:35 +08:00
Marina Glancy
653f6c23cb Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle 2014-10-23 15:23:52 +08:00
Marina Glancy
18ebeed5e9 Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle 2014-10-23 15:21:28 +08:00
Dan Poltawski
bcd015bea6 Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle 2014-10-23 08:18:31 +01:00
Dave Cooper
17472f57b9 MDL-47689 user: Add duplicate field check to avoid oracle db error. 2014-10-23 15:10:31 +08:00
Adrian Greeve
1785e49f26 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-23 15:05:32 +08:00
Andrew Nicols
d247a50113 MDL-47734 core: Prevent jumping of YUI dialogues
When a YUI dialogue was opened, it was focusing on the boundingBox, with
the browser moving the scroll position to focus on the top of the
boundingBox. This caused a jump. This only happens when the dialogue is
modal and consequentially has a maskNode present as it changes the initial
positioning behaviour of the boundingBox.

To avoid this, when the maskNode is shown, the dialogue is position at 0,0
in the current viewport. For centered dialogues, the dialogue is
automatically re-positioned after the window has shown. For non-centered
dialogues, the original position is stored and the dialogue is restored to
that position after it has been displayed.

This should not interfere with use of the align function as this will be
called later in the proceedings, after the show has run.
2014-10-23 14:44:14 +08:00
Damyon Wiese
99e455c7ea Merge branch 'MDL-47740' of git://github.com/timhunt/moodle 2014-10-23 14:24:47 +08:00
Damyon Wiese
54420a98b1 Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle 2014-10-23 13:52:15 +08:00
Damyon Wiese
ed60e0eac5 MDL-47713 Grades: Fix new behat test after conversion from points to %
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
2014-10-23 13:37:24 +08:00
Damyon Wiese
f9c90d8751 MDL-47763 Grades: Handle the case when a grade category is hidden.
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
2014-10-23 13:26:40 +08:00
Damyon Wiese
79bf093ee2 Merge branch 'MDL-32616' of git://github.com/timhunt/moodle 2014-10-23 12:02:22 +08:00
Jetha Chan
beb7456e3e MDL-47819 user_menu: fixed showing up in popups 2014-10-23 11:58:11 +08:00
Damyon Wiese
f3d7cdffda MDL-47836 Grades: Fix the url for the upgraded grades warning page url. 2014-10-23 11:31:55 +08:00
Andrew Nicols
4a8c380abb MDL-47513 Fix RTL issues with grade report 2014-10-23 11:15:35 +08:00
John Okely
66f5e82b66 MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers 2014-10-23 10:33:15 +08:00
John Okely
0cafac69f2 MDL-47767 tool_monitor: Add links between subscribe and rule manager 2014-10-23 10:33:15 +08:00
Andrew Nicols
555837c5d4 MDL-47808 mod_forum: Correct maxeditingtime for unit tests
The maxeditingtime needs to be a negative value for unit tests to ensure
that the messages are actually sent out.

Whilst fixing this I also discovered that the create_discussion part of the
generator also creates the first post.
2014-10-23 08:43:29 +08:00
Jean-Michel Vedrine
d3c4d50f1f MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-22 18:00:49 +02:00
Dan Poltawski
e6afd45f96 Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-22 10:49:07 +01:00
Frederic Massart
40a603c79d MDL-47814 core_grades: Improved coverage of user_graded event tests
The tests needed to use the API in order to trigger the user_graded
event that occurs when the course final grade has changed.
2014-10-22 16:53:16 +08:00
Damyon Wiese
d1020cd5d4 MDL-47815 assign: Fix random unit test fails
This test was failing when it was run really slowly (looking at you oracle).
2014-10-22 16:49:00 +08:00
Damyon Wiese
b0c5a9c491 MDL-47713 Grades: Update all the behat tests to use % in contribution column 2014-10-22 16:20:15 +08:00
Damyon Wiese
8950e7f535 on-demand release 2.8beta+ 2014-10-22 15:06:37 +08:00
Damyon Wiese
6a196cf14d NOBUG: Fixed file access permissions 2014-10-22 15:06:36 +08:00
Damyon Wiese
2746fbe47c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-22 15:06:33 +08:00
Frederic Massart
6aeebc259a MDL-47637 core_grades: Outcomes must not be weighted when non aggregated 2014-10-22 14:58:17 +08:00
Damyon Wiese
718f179c22 Merge branch 'MDL-47706-master' of git://github.com/andrewnicols/moodle 2014-10-22 14:50:53 +08:00
Marina Glancy
fca97cbec4 MDL-47673 grades: unittest change caused by generator change
Unit test was introduced in MDL-40697 when the generator for quiz activity was setting grade=0
2014-10-22 14:14:49 +08:00
Andrew Nicols
bedcf338dc MDL-47706 gradebook: Update pageload time between changes
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.

Different errors were seen because the millisecond rollover occurred at
different time within the test.

Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
2014-10-22 12:56:07 +08:00
Damyon Wiese
7a61e645c3 MDL-46527 Grades: Webservice only returns first activity grade. 2014-10-22 11:21:51 +08:00
Damyon Wiese
53f26095c6 Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle 2014-10-22 10:45:57 +08:00
Mark Nelson
8a0c649637 MDL-47153 tool_monitor: altered unit tests to pass 2014-10-21 16:00:26 -07:00
Mark Nelson
11c2bf3f73 MDL-47153 tool_monitor: added subscription_criteria_met event 2014-10-21 16:00:18 -07:00
Mark Nelson
1adb0031c0 MDL-47153 tool_monitor: added subscription_deleted event 2014-10-21 15:48:10 -07:00
Mark Nelson
229f841907 MDL-47153 tool_monitor: added subscription_created event 2014-10-21 15:48:10 -07:00
Mark Nelson
91df5f7e37 MDL-47153 tool_monitor: added rule_deleted event 2014-10-21 15:48:09 -07:00
Mark Nelson
12b9969ef9 MDL-47153 tool_monitor: added rule_updated event 2014-10-21 15:48:09 -07:00
Mark Nelson
e9da23369f MDL-47153 tool_monitor: added rule_created event 2014-10-21 14:19:16 -07:00
AMOS bot
e15766c19c Automatically generated installer lang files 2014-10-22 00:07:37 +08:00
Gareth J Barnard
a024eaa5fc MDL-47795 SCORM: SCORM report not a report. 2014-10-21 15:37:31 +01:00
Tim Hunt
cda62a3829 MDL-47791 question editing: remove permission info from above the form
This information is not really meaningful for users, and takes up prime
real-estate, so we are removing it.
2014-10-21 15:03:20 +01:00
Tim Hunt
a8de866712 MDL-47740 question engine: let qs update variant later if appropriate
Variant has two purposes. First to determine which version of the
question the student will see. Hence it is used to set up the state
of the quetsion when the question is started. Then the internal state of
the question is saved in the first step.

Once that has been done, the variant number is purely informative, and
just used to break down the statistics.

In some cases (the one I have in mind is qtype_opaque) then there is a
complex randomisation process, which may lead to several inital variant
numbers acutally giving the same version of the question. In this case
it is nice if the question can update the stored variant number, to make
the statistics more meaningful.
2014-10-21 11:43:57 +01:00
Juan Leyva
a7888487f0 MDL-46527 grades: grade_get_grades external function rewritten 2014-10-21 12:10:01 +02:00
Mark Nelson
6c271ab5e6 MDL-47780 core: corrected docs for get_user_capability_course() 2014-10-21 00:52:54 -07:00