moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71074 commits 37 branches 540 tags 1.3 GiB
Commit graph

71074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
8112670d62 MDL-47815 assign: Fix random unit test fails 
This test was failing when it was run really slowly (looking at you oracle).
 2014-10-24 11:48:18 +02:00
Dan Poltawski
ad968a36d6 Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle 2014-10-24 11:48:17 +02:00
Juan Leyva
938728739b MDL-47847 Web Services: Add messaging functions to the mobile service 2014-10-24 11:48:17 +02:00
Dan Poltawski
0ca7a4b75b Merge branch '47752-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:16 +02:00
Dan Poltawski
3456ac3ba0 Merge branch '47684-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:16 +02:00
Dan Poltawski
276af2a44d Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
f335c9a1f1 Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
4ade5b11b2 Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:14 +02:00
Frederic Massart
3e5a4c9047 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-24 11:48:14 +02:00
Dan Poltawski
4fdd69373b Merge branch 'MDL-47767-master' of git://github.com/xow/moodle 2014-10-24 11:48:13 +02:00
John Okely
6a6dd57c90 MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers 2014-10-24 11:48:13 +02:00
Dan Poltawski
fc533908b0 Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle 2014-10-24 11:48:12 +02:00
John Okely
220602b7f0 MDL-47767 tool_monitor: Add links between subscribe and rule manager 2014-10-24 11:48:12 +02:00
Dan Poltawski
1153177851 Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle 2014-10-24 11:48:11 +02:00
Marina Glancy
2a9bc5909d Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle 2014-10-24 11:48:11 +02:00
Marina Glancy
bb030ebc2a Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle 2014-10-24 11:48:10 +02:00
Dave Cooper
368f0bf8f6 MDL-47689 user: Add duplicate field check to avoid oracle db error. 2014-10-24 11:48:10 +02:00
Marina Glancy
c3b545a92a Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:09 +02:00
Marina Glancy
13c9e9c043 Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle 2014-10-24 11:48:08 +02:00
Damyon Wiese
578d905ec0 Merge branch '47077-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:08 +02:00
Frederic Massart
5dd0cb7bce 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-24 11:48:07 +02:00
Damyon Wiese
444ff60526 Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle 2014-10-24 11:48:07 +02:00
Marina Glancy
3824556c9a Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle 2014-10-24 11:48:06 +02:00
Marina Glancy
65504187d8 Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle 2014-10-24 11:48:06 +02:00
Damyon Wiese
2c89eeeb8e Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle 2014-10-24 11:48:05 +02:00
Damyon Wiese
edffadfd1c 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-24 11:48:05 +02:00
Marina Glancy
1e3dc6ed9c Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle 2014-10-24 11:48:04 +02:00
Adrian Greeve
780ff300a8 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-24 11:48:04 +02:00
Marina Glancy
b7840d4783 Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle 2014-10-24 11:48:03 +02:00
Damyon Wiese
f01972d95e MDL-47836 Grades: Fix the url for the upgraded grades warning page url. 2014-10-24 11:48:03 +02:00
Dan Poltawski
ea4361b3a5 Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle 2014-10-24 11:48:02 +02:00
Jetha Chan
edcca18f8d MDL-47819 user_menu: fixed showing up in popups 2014-10-24 11:48:02 +02:00
Damyon Wiese
bdb319a5b1 Merge branch 'MDL-47740' of git://github.com/timhunt/moodle 2014-10-24 11:48:01 +02:00
Damyon Wiese
a7c37934cc 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-24 11:48:01 +02:00
Damyon Wiese
721c6d397c Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle 2014-10-24 11:48:00 +02:00
Jean-Michel Vedrine
5fc6a9e77b MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-24 11:48:00 +02:00
Dan Poltawski
7a811fb63a Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-24 11:47:59 +02:00
Damyon Wiese
96ef037856 Merge branch 'MDL-32616' of git://github.com/timhunt/moodle 2014-10-24 11:47:59 +02:00
Eloy Lafuente (stronk7)
e739fbcf27 Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle 2014-10-24 11:05:54 +02:00
Juan Leyva
a7b572e29d MDL-47850 message_airnotifier: Incorrect Airnotifier Web Service URL 2014-10-24 10:40:06 +02:00
Juan Leyva
e13c152e82 MDL-47690 web services: Fixed invalid return parameter type in mod_url 2014-10-24 09:54:35 +02:00
Simey Lameze
7bd88b0039 MDL-47782 tool_monitor: Added context column on rule management page. 
AMOS BEGIN
CPY [context,message],[context,tool_monitor]
AMOS END
 2014-10-24 15:41:45 +08:00
Marina Glancy
d4a9e66130 MDL-47812 mod_lti: execute upgrade script for all DBs 2014-10-24 14:00:30 +08:00
Ankit Agarwal
a8ea7cccce MDL-47805 tool_monitor: More info in adhoc task 2014-10-24 11:24:53 +05:30
Adam Olley
4ac478a3ed MDL-47804 events: calendar_event_updated needs to accept a timestart == 0 2014-10-24 15:34:30 +10:30
Andrew Nicols
107e82f6a6 MDL-47866 gradereport_grader: Remove border radius from cells 2014-10-24 11:54:56 +08:00
Mark Nelson
5e83b20527 MDL-47778 tool_monitor: changes made to get_user_courses_select() 
The changes -

1) Ensure courses exist before we loop to avoid PHP warning.
2) Checked that the number of courses to display do not exceed the max setting.
3) Used format_string() instead of format_text().
4) Used the course context instead of system context.
 2014-10-23 20:20:41 -07:00
Sam Hemelryk
00b568bd09 MDL-46332 fixed whitespace 2014-10-24 14:34:36 +13:00
Adrian Greeve
65e274d76f MDL-47676 core_grades: Behat test for negative weights. 2014-10-24 08:43:16 +08:00
Adrian Greeve
cd5c7965e0 MDL-47676 core_grades: Negative positive weight combo working. 
The combination of negative and positive weights was not normalising
properly.
 2014-10-24 08:43:16 +08:00