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
Sam Hemelryk
68085f2bd5
Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle
2014-10-24 12:02:14 +13:00
Sam Hemelryk
29a3060265
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
2014-10-24 11:58:36 +13:00
Sam Hemelryk
124932d223
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
2014-10-24 11:23:04 +13:00
Sam Hemelryk
ef54717024
Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle
2014-10-24 11:19:43 +13:00
Sam Hemelryk
ec998f7487
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
2014-10-24 11:17:00 +13:00
Sam Hemelryk
18f1797517
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
2014-10-24 09:58:53 +13:00
gdharris
04f7dcebe4
MDL-46853 calendar: fix import of no duration events
2014-10-24 09:55:11 +13:00
Dan Poltawski
89df18c73d
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
2014-10-23 17:30:28 +01:00
Dan Poltawski
f01242a3b4
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
2014-10-23 17:28:36 +01:00
Dan Poltawski
a92008ed25
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
2014-10-23 16:35:50 +01:00
Dan Poltawski
aed3a3430f
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
2014-10-23 16:31:24 +01:00
Dan Poltawski
9a3385cb2d
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
2014-10-23 16:31:08 +01:00
Dan Poltawski
25bd390b4b
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
2014-10-23 16:17:49 +01:00
Dan Poltawski
7b57a751ae
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
2014-10-23 16:16:07 +01:00
Dan Poltawski
98122f9ad4
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
2014-10-23 16:13:11 +01:00
Juan Leyva
0c5481e43d
MDL-47847 Web Services: Add messaging functions to the mobile service
2014-10-23 15:24:07 +02:00
Dan Poltawski
cd9f037e04
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
2014-10-23 10:50:01 +01:00
Dan Poltawski
7ea782ab3c
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
2014-10-23 10:41:58 +01:00
Dan Poltawski
ec007900c0
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
2014-10-23 10:19:53 +01:00
Juan Leyva
5e28991e78
MDL-47545 web services: Allow cross origin requests
2014-10-23 11:17:41 +02:00
Marina Glancy
36594faebb
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
2014-10-23 17:16:44 +08:00
Marina Glancy
aeeccb1697
Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
2014-10-23 17:09:32 +08:00
Marina Glancy
d129a0ffe9
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
2014-10-23 16:57:56 +08:00
Marina Glancy
d3312bb6ac
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
2014-10-23 16:35:59 +08:00
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