70679 Commits

Author SHA1 Message Date
Frederic Massart
aad194b19a MDL-47397 editor_atto: Properly close confirm dialogue in Behat test 2014-10-24 15:09:06 +01:00
Dan Poltawski
e29ec53238 Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle 2014-10-24 14:53:21 +01:00
Andrew Nicols
71bc139d63 MDL-47802 mod_forum: Check for required subscription capabilities
Users must be able to both view, and manage their subscription in order to
subscribe or be subscribed to a discussion.
2014-10-24 14:44:21 +01:00
Andrew Nicols
0603df04da MDL-47802 mod_forum: Include discussion subscriptions when moving
Check for both forum, and discussion subscriptions when moving a discussion
to a different forum.
2014-10-24 14:44:21 +01:00
Zachary Durber
5b2571547f MDL-47873 gradebook: Fix for missing override checkboxes. 2014-10-24 14:39:20 +01:00
Dan Poltawski
6c6375e438 Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2014-10-24 14:34:09 +01:00
Dan Poltawski
7dc62ed3cb Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle 2014-10-24 14:30:44 +01:00
Dan Poltawski
1429a25cd8 Merge branch 'MDL-47734-master' of git://github.com/andrewnicols/moodle 2014-10-24 14:13:59 +01:00
Dan Poltawski
d63a81c507 on-demand release 2.8beta+ 2014-10-24 11:15:32 +01:00
Damyon Wiese
4bb46504ee Merge branch 'wip-MDL-47542-master' of git://github.com/marinaglancy/moodle 2014-10-24 11:49:19 +02:00
Marina Glancy
079b2e5202 MDL-47542 core_grades: action menu for grade setup 2014-10-24 11:49:19 +02:00
Marina Glancy
4ea3258af9 Merge branch 'MDL-47813-master' of git://github.com/xow/moodle 2014-10-24 11:49:18 +02:00
John Okely
4809376f13 MDL-47813 tool_monitor: Fix rule manager unit tests in oracle 2014-10-24 11:49:18 +02:00
Damyon Wiese
996de187a5 MDL-47704 Grades: Behat fix - dropped items have no contribution
We see "-" instead of "0.00 %"
2014-10-24 11:49:17 +02:00
Damyon Wiese
d8e98c3178 Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle 2014-10-24 11:49:17 +02:00
Marina Glancy
681276aad2 Merge branch 'MDL-47838-master-fix3' of https://github.com/damyon/moodle 2014-10-24 11:49:16 +02:00
Frederic Massart
2eb60f110d MDL-47637 core_grades: Remove extra credit field in outcome test 2014-10-24 11:49:16 +02:00
Andrew Nicols
504d0a1821 MDL-47513 theme_base: Fix grader report when blocks are docked 2014-10-24 11:49:15 +02:00
Damyon Wiese
0ce4642864 MDL-47838 gradereport_singleview: Reuse get_element_header instead of rolling our own.
This means the grade.php / index.php is kept in one place.
2014-10-24 11:49:15 +02:00
Marina Glancy
c785cc9893 Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle 2014-10-24 11:49:11 +02:00
Damyon Wiese
d700fa463e Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle 2014-10-24 11:48:25 +02:00
Damyon Wiese
0b9635cba4 Merge branch '46499-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:24 +02:00
Zachary Durber
237f76ce14 MDL-47838 gradebook: Singleview fix for invalid links. 2014-10-24 11:48:24 +02:00
Sam Hemelryk
fad1a02d21 MDL-46332 fixed whitespace 2014-10-24 11:48:23 +02:00
Sam Hemelryk
a1428d4be6 Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle 2014-10-24 11:48:23 +02:00
Sam Hemelryk
065448834c Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:22 +02:00
Sam Hemelryk
fc91acc813 Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:22 +02:00
Sam Hemelryk
614820522f Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle 2014-10-24 11:48:21 +02:00
Sam Hemelryk
7117571c34 Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle 2014-10-24 11:48:21 +02:00
Sam Hemelryk
1e97569713 Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle 2014-10-24 11:48:20 +02:00
gdharris
ee19ae694a MDL-46853 calendar: fix import of no duration events 2014-10-24 11:48:20 +02:00
Dan Poltawski
0255780b9c Merge branch 'MDL-47791' of git://github.com/timhunt/moodle 2014-10-24 11:48:19 +02:00
Dan Poltawski
a5f9fc6be3 Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle 2014-10-24 11:48:19 +02:00
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