Commit graph

71629 commits

Author SHA1 Message Date
Syxton
35e7ad6a60 MDL-47777 assign: max files hard coded to setting
The current file submission is hard coded to a maximum of 20 files
possible.  While the user can choose a number less than 20, the maximum
is still set in code.  This converts the hard coded 20 to a site setting
defaulting to 20.
2014-10-22 08:24:30 -04: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
Russell Smith
34f5a2bc4f MDL-47806: Add footer function for command line output. 2014-10-22 14:32:15 +11: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
Marina Glancy
b1b66a3d12 Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle 2014-10-21 15:49:10 +08:00
Mark Nelson
7b62567e85 MDL-47736 editor_atto: added fix for IE 9 and 10 2014-10-21 00:46:35 -07:00
Marina Glancy
fb32a64efc Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle 2014-10-21 14:34:05 +08:00
Mark Nelson
3c15d25bcf MDL-47736 editor_atto: exclude <br> from being restored 2014-10-20 23:24:08 -07:00
Damyon Wiese
fc9150cb0e MDL-47713 Grades: Change contribution column to a percent of grademax 2014-10-21 13:50:18 +08:00
Damyon Wiese
a6396272f8 Merge branch 'wip_MDL-41593_m28_preventexecdefault' of https://github.com/skodak/moodle 2014-10-21 13:11:27 +08:00
Marina Glancy
e94925ddd2 Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle 2014-10-21 11:56:31 +08:00
Yuliya Bozhko
1f258cd8ce MDL-47755 badges: Fix internal message output
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-10-21 16:25:13 +13:00
Damyon Wiese
a9a02e9170 MDL-20367 Grades: Allow real numbers as grade boundaries
Patch by Huy Hoang (I just git-ified it).
2014-10-21 11:15:39 +08:00
Marina Glancy
8b2d85406a Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle 2014-10-21 10:55:54 +08:00
Andrew Nicols
82e3440aec MDL-47400 gradereport_history: Fix string notempty test for Oracle 2014-10-21 10:48:28 +08:00
Sam Hemelryk
56f9e921f4 MDL-46133 tool_monitor: version bump for events 2014-10-21 15:22:10 +13:00
Sam Hemelryk
258d9af845 Merge branch 'm28_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle 2014-10-21 15:17:53 +13:00
Sam Hemelryk
7a126c94a4 Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle 2014-10-21 14:44:01 +13:00
Sam Hemelryk
28f1bd0106 Merge branch 'MDL-47695' of git://github.com/timhunt/moodle 2014-10-21 14:42:36 +13:00
Sam Hemelryk
263f8cff7e Merge branch 'MDL-46133_master' of https://github.com/markn86/moodle 2014-10-21 14:39:34 +13:00
Matteo Scaramuccia
8045696b37 MDL-36669 Filters: Remove the last ref to the UFO library. 2014-10-20 23:17:50 +02:00
Dan Poltawski
96b1223387 Merge branch 'MDL-38172' of git://github.com/jmvedrine/moodle 2014-10-20 18:28:44 +01:00
Dan Poltawski
83b49754d3 Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle 2014-10-20 18:12:38 +01:00
Dan Poltawski
cf3fbf8a0e Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle 2014-10-20 17:49:02 +01:00
Dan Poltawski
6c75bcb5d6 Merge branch 'MDL-47651' of git://github.com/timhunt/moodle 2014-10-20 17:44:33 +01:00
Dan Poltawski
fb45249754 Merge branch 'MDL-47666' of git://github.com/timhunt/moodle 2014-10-20 17:31:20 +01:00