0ca7a4b75b
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
2014-10-24 11:48:16 +02:00
276af2a44d
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
2014-10-24 11:48:15 +02:00
f335c9a1f1
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
2014-10-24 11:48:15 +02:00
4ade5b11b2
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
2014-10-24 11:48:14 +02:00
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
1153177851
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
2014-10-24 11:48:11 +02:00
c3b545a92a
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
2014-10-24 11:48:09 +02:00
3824556c9a
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
2014-10-24 11:48:06 +02:00
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
4ac478a3ed
MDL-47804 events: calendar_event_updated needs to accept a timestart == 0
2014-10-24 15:34:30 +10:30
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
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
4a8c380abb
MDL-47513 Fix RTL issues with grade report
2014-10-23 11:15:35 +08:00
6a196cf14d
NOBUG: Fixed file access permissions
2014-10-22 15:06:36 +08:00
6aeebc259a
MDL-47637 core_grades: Outcomes must not be weighted when non aggregated
2014-10-22 14:58:17 +08:00
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
34f5a2bc4f
MDL-47806: Add footer function for command line output.
2014-10-22 14:32:15 +11:00
7a61e645c3
MDL-46527 Grades: Webservice only returns first activity grade.
2014-10-22 11:21:51 +08:00
53f26095c6
Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle
2014-10-22 10:45:57 +08:00
a7888487f0
MDL-46527 grades: grade_get_grades external function rewritten
2014-10-21 12:10:01 +02:00
6c271ab5e6
MDL-47780 core: corrected docs for get_user_capability_course()
2014-10-21 00:52:54 -07:00
b1b66a3d12
Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle
2014-10-21 15:49:10 +08:00
7b62567e85
MDL-47736 editor_atto: added fix for IE 9 and 10
2014-10-21 00:46:35 -07:00
fb32a64efc
Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle
2014-10-21 14:34:05 +08:00
3c15d25bcf
MDL-47736 editor_atto: exclude <br> from being restored
2014-10-20 23:24:08 -07:00
a6396272f8
Merge branch 'wip_MDL-41593_m28_preventexecdefault' of https://github.com/skodak/moodle
2014-10-21 13:11:27 +08:00
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
258d9af845
Merge branch 'm28_MDL-36669_UFO_references_in_filelib' of https://github.com/scara/moodle
2014-10-21 15:17:53 +13:00
7a126c94a4
Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle
2014-10-21 14:44:01 +13:00
8045696b37
MDL-36669 Filters: Remove the last ref to the UFO library.
2014-10-20 23:17:50 +02:00
cf3fbf8a0e
Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle
2014-10-20 17:49:02 +01:00
6366cc0774
Merge branch 'MDL-47711' of git://github.com/timhunt/moodle
2014-10-20 17:28:50 +01:00
11c6debb0a
Merge branch 'MDL-47588' of git://github.com/timhunt/moodle
2014-10-20 14:30:46 +01:00
d69a6ad965
MDL-47711 behat: make it easier to copy the init.php command.
2014-10-20 12:11:28 +01:00
a92105fd3f
MDL-47588 behat: fix switching back to the main window in Chrome
...
This fix is mostly based on what Colin Chambers found out. This commit
is a simplification of his work.
The problem is that the Chrome / Selenium 2 integration cannot swich to
a window with a blank name. The work-around applied here is, when we
switch away from an unnamed window, we set a name on it. Then we can use
that name to switch back.
2014-10-20 12:10:14 +01:00
2d2661e3d7
Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle
2014-10-20 17:08:20 +08:00
f75f2ecdf4
Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle
2014-10-20 15:19:57 +08:00
c42d18183a
MDL-47675 phpunit: Update unit tests to pass on MSSQL
...
Unit tests were failing on MSSQL. gc_collect_cycles() was
removed from the phpunit utils.php file to save time in running
the tests, but MSSQL doesn't clean up open files as well as
other databases.
This patch includes the garbage collection for the unit tests
that require it.
2014-10-20 14:26:11 +08:00
8427dc3a23
MDL-47489 core_grades: Adjust weights of extra credit items for Simple
2014-10-20 13:52:18 +08:00
e8ac04c191
MDL-47489 core_grades: Adjust weights of extra credit items for Mean
2014-10-20 13:52:17 +08:00
e924e1b33a
MDL-47736 editor_atto: only save/restore draft when necessary
2014-10-19 22:14:15 -07:00
c57681ed49
Merge branch 'MDL-47737-master' of git://github.com/FMCorz/moodle
2014-10-20 12:43:52 +08:00
47d6e6a7d3
MDL-47503 Grades: Completely remove aggregationsubcats
...
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
2014-10-20 12:03:18 +08:00
86974893c8
MDL-47489 core_grades: Adjust weights of extra credit items for Natural
2014-10-20 11:50:43 +08:00
74d0ca1543
MDL-47739 form: Calendar widget causes unintentional focus and scroll
2014-10-20 10:55:49 +08:00
5c28d15985
MDL-46518 navigation: site glossaries now expand properly
2014-10-20 11:18:36 +13:00
30aca4a74b
MDL-46499 navigation: better enrolled course limit
...
We now user $CFG->navcourselimit to limit the number of
courses shown in the navigation when browsing another users
full profile. Previously it showed all courses which caused
some slowdown.
2014-10-20 10:58:40 +13:00
ed7605f481
MDL-47752 grading: fixed bugs with the modgrade element
2014-10-20 10:32:13 +13:00
c62ba9b8ca
MDL-47735 core: prevented iteration of 'groupmembersonly'
...
The course module variable 'groupmembersonly' was removed in 2.8.
2014-10-17 18:23:35 -07:00
53cca2274e
MDL-47737 editor_atto: Prevent false negative when saving draft on IE9
2014-10-17 20:48:43 +08:00
Dan Poltawski