Dan Poltawski [Fri, 24 Oct 2014 13:34:09 +0000 (14:34 +0100)]
Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle
Conflicts:
version.php
Dan Poltawski [Fri, 24 Oct 2014 13:30:44 +0000 (14:30 +0100)]
Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Fri, 24 Oct 2014 13:13:59 +0000 (14:13 +0100)]
Merge branch 'MDL-47734-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Fri, 24 Oct 2014 10:15:32 +0000 (11:15 +0100)]
on-demand release 2.8beta+
Damyon Wiese [Fri, 24 Oct 2014 08:26:32 +0000 (16:26 +0800)]
Merge branch 'wip-MDL-47542-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 14 Oct 2014 06:53:28 +0000 (14:53 +0800)]
MDL-47542 core_grades: action menu for grade setup
Marina Glancy [Fri, 24 Oct 2014 08:22:12 +0000 (16:22 +0800)]
Merge branch 'MDL-47813-master' of git://github.com/xow/moodle
John Okely [Fri, 24 Oct 2014 02:38:30 +0000 (10:38 +0800)]
MDL-47813 tool_monitor: Fix rule manager unit tests in oracle
Damyon Wiese [Fri, 24 Oct 2014 08:16:11 +0000 (16:16 +0800)]
MDL-47704 Grades: Behat fix - dropped items have no contribution
We see "-" instead of "0.00 %"
Damyon Wiese [Fri, 24 Oct 2014 07:38:33 +0000 (15:38 +0800)]
Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle
Marina Glancy [Fri, 24 Oct 2014 07:18:16 +0000 (15:18 +0800)]
Merge branch 'MDL-47838-master-fix3' of https://github.com/damyon/moodle
Frederic Massart [Fri, 24 Oct 2014 07:32:50 +0000 (15:32 +0800)]
MDL-47637 core_grades: Remove extra credit field in outcome test
Andrew Nicols [Fri, 24 Oct 2014 04:34:20 +0000 (12:34 +0800)]
MDL-47513 theme_base: Fix grader report when blocks are docked
Damyon Wiese [Fri, 24 Oct 2014 06:43:03 +0000 (14:43 +0800)]
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.
Marina Glancy [Fri, 24 Oct 2014 03:54:42 +0000 (11:54 +0800)]
Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle
Damyon Wiese [Fri, 24 Oct 2014 03:23:53 +0000 (11:23 +0800)]
Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle
Damyon Wiese [Fri, 24 Oct 2014 01:56:55 +0000 (09:56 +0800)]
Merge branch '46499-28' of git://github.com/samhemelryk/moodle
Zachary Durber [Thu, 23 Oct 2014 03:53:42 +0000 (11:53 +0800)]
MDL-47838 gradebook: Singleview fix for invalid links.
Sam Hemelryk [Fri, 24 Oct 2014 01:34:36 +0000 (14:34 +1300)]
MDL-46332 fixed whitespace
Sam Hemelryk [Thu, 23 Oct 2014 23:02:14 +0000 (12:02 +1300)]
Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)]
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)]
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:19:43 +0000 (11:19 +1300)]
Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)]
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
Sam Hemelryk [Thu, 23 Oct 2014 20:58:53 +0000 (09:58 +1300)]
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
gdharris [Fri, 15 Aug 2014 19:31:48 +0000 (15:31 -0400)]
MDL-46853 calendar: fix import of no duration events
Dan Poltawski [Thu, 23 Oct 2014 16:30:28 +0000 (17:30 +0100)]
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)]
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 22 Oct 2014 08:49:00 +0000 (16:49 +0800)]
MDL-47815 assign: Fix random unit test fails
This test was failing when it was run really slowly (looking at you oracle).
Dan Poltawski [Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)]
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
Juan Leyva [Thu, 23 Oct 2014 13:24:07 +0000 (15:24 +0200)]
MDL-47847 Web Services: Add messaging functions to the mobile service
Dan Poltawski [Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)]
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:31:08 +0000 (16:31 +0100)]
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:17:49 +0000 (16:17 +0100)]
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:16:07 +0000 (16:16 +0100)]
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)]
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 22 Oct 2014 08:50:21 +0000 (16:50 +0800)]
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.
Dan Poltawski [Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)]
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
John Okely [Tue, 21 Oct 2014 04:18:19 +0000 (12:18 +0800)]
MDL-47767 tool_monitor: Use renderers for links between subscription and rule managers
Dan Poltawski [Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)]
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
John Okely [Mon, 20 Oct 2014 09:01:08 +0000 (17:01 +0800)]
MDL-47767 tool_monitor: Add links between subscribe and rule manager
Dan Poltawski [Thu, 23 Oct 2014 09:19:53 +0000 (10:19 +0100)]
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)]
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 23 Oct 2014 09:09:32 +0000 (17:09 +0800)]
Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
Dave Cooper [Thu, 23 Oct 2014 07:08:14 +0000 (15:08 +0800)]
MDL-47689 user: Add duplicate field check to avoid oracle db error.
Marina Glancy [Thu, 23 Oct 2014 08:57:56 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 23 Oct 2014 08:35:59 +0000 (16:35 +0800)]
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 23 Oct 2014 08:09:29 +0000 (16:09 +0800)]
Merge branch '47077-28' of git://github.com/samhemelryk/moodle
Frederic Massart [Mon, 20 Oct 2014 07:24:45 +0000 (15:24 +0800)]
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.
Damyon Wiese [Thu, 23 Oct 2014 07:47:10 +0000 (15:47 +0800)]
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle
Marina Glancy [Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)]
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 07:42:46 +0000 (15:42 +0800)]
Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 23 Oct 2014 07:38:35 +0000 (15:38 +0800)]
Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle
Damyon Wiese [Thu, 23 Oct 2014 03:22:10 +0000 (11:22 +0800)]
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.
Marina Glancy [Thu, 23 Oct 2014 07:23:52 +0000 (15:23 +0800)]
Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle
Adrian Greeve [Thu, 23 Oct 2014 07:05:32 +0000 (15:05 +0800)]
MDL-43245 mod_lesson: Add string for essay grading permission.
Marina Glancy [Thu, 23 Oct 2014 07:21:28 +0000 (15:21 +0800)]
Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle
Damyon Wiese [Thu, 23 Oct 2014 03:31:55 +0000 (11:31 +0800)]
MDL-47836 Grades: Fix the url for the upgraded grades warning page url.
Dan Poltawski [Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)]
Merge branch 'MDL-47713-master-fix1' of github.com/damyon/moodle
Jetha Chan [Thu, 23 Oct 2014 03:58:11 +0000 (11:58 +0800)]
MDL-47819 user_menu: fixed showing up in popups
Damyon Wiese [Thu, 23 Oct 2014 06:24:47 +0000 (14:24 +0800)]
Merge branch 'MDL-47740' of git://github.com/timhunt/moodle
Damyon Wiese [Thu, 23 Oct 2014 05:37:24 +0000 (13:37 +0800)]
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 %.
Damyon Wiese [Thu, 23 Oct 2014 05:52:15 +0000 (13:52 +0800)]
Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle
Jean-Michel Vedrine [Thu, 16 Oct 2014 19:46:27 +0000 (21:46 +0200)]
MDL-43245 Lesson: non editing teacher cannot grade lesson essay
Dan Poltawski [Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)]
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 23 Oct 2014 04:02:22 +0000 (12:02 +0800)]
Merge branch 'MDL-32616' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 24 Oct 2014 09:05:54 +0000 (11:05 +0200)]
Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle
Marina Glancy [Fri, 24 Oct 2014 06:00:30 +0000 (14:00 +0800)]
MDL-47812 mod_lti: execute upgrade script for all DBs
Andrew Nicols [Fri, 24 Oct 2014 03:54:54 +0000 (11:54 +0800)]
MDL-47866 gradereport_grader: Remove border radius from cells
Sam Hemelryk [Fri, 24 Oct 2014 01:34:36 +0000 (14:34 +1300)]
MDL-46332 fixed whitespace
Adrian Greeve [Wed, 15 Oct 2014 02:36:03 +0000 (10:36 +0800)]
MDL-47676 core_grades: Behat test for negative weights.
Adrian Greeve [Wed, 15 Oct 2014 02:34:49 +0000 (10:34 +0800)]
MDL-47676 core_grades: Negative positive weight combo working.
The combination of negative and positive weights was not normalising
properly.
Sam Hemelryk [Thu, 23 Oct 2014 23:02:14 +0000 (12:02 +1300)]
Merge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennettUK/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)]
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)]
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:19:43 +0000 (11:19 +1300)]
Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)]
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
Sam Hemelryk [Thu, 23 Oct 2014 20:58:53 +0000 (09:58 +1300)]
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
gdharris [Fri, 15 Aug 2014 19:31:48 +0000 (15:31 -0400)]
MDL-46853 calendar: fix import of no duration events
Dan Poltawski [Thu, 23 Oct 2014 16:30:28 +0000 (17:30 +0100)]
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)]
Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)]
Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)]
Merge branch '47752-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:31:08 +0000 (16:31 +0100)]
Merge branch '47684-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:17:49 +0000 (16:17 +0100)]
Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:16:07 +0000 (16:16 +0100)]
Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)]
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
Juan Leyva [Thu, 23 Oct 2014 13:24:07 +0000 (15:24 +0200)]
MDL-47847 Web Services: Add messaging functions to the mobile service
Dan Poltawski [Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)]
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
Dan Poltawski [Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)]
Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 23 Oct 2014 09:19:53 +0000 (10:19 +0100)]
Merge branch 'MDL-47499-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 09:16:44 +0000 (17:16 +0800)]
Merge branch 'MDL-47808-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 23 Oct 2014 09:09:32 +0000 (17:09 +0800)]
Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
Marina Glancy [Thu, 23 Oct 2014 08:57:56 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
Marina Glancy [Thu, 23 Oct 2014 08:35:59 +0000 (16:35 +0800)]
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 23 Oct 2014 08:09:29 +0000 (16:09 +0800)]
Merge branch '47077-28' of git://github.com/samhemelryk/moodle
Frederic Massart [Mon, 20 Oct 2014 07:24:45 +0000 (15:24 +0800)]
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.
Damyon Wiese [Thu, 23 Oct 2014 07:47:10 +0000 (15:47 +0800)]
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle
Marina Glancy [Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)]
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 07:42:46 +0000 (15:42 +0800)]
Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
