moodle.git
7 years agoMDL-47585 stats: fixed incorrect user dropdown
Marina Glancy [Thu, 9 Oct 2014 06:35:15 +0000 (14:35 +0800)]
MDL-47585 stats: fixed incorrect user dropdown

7 years agoMerge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 27 Oct 2014 14:51:04 +0000 (14:51 +0000)]
Merge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-47839-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 27 Oct 2014 08:01:33 +0000 (08:01 +0000)]
Merge branch 'MDL-47839-master' of git://github.com/FMCorz/moodle

7 years agoMDL-47839 core_grades: Minor styling improvements to setup/user report
Frederic Massart [Fri, 24 Oct 2014 04:35:31 +0000 (12:35 +0800)]
MDL-47839 core_grades: Minor styling improvements to setup/user report

7 years agoMerge branch 'wip-mdl-47676-m' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 27 Oct 2014 07:47:07 +0000 (07:47 +0000)]
Merge branch 'wip-mdl-47676-m' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-47734-master-fixes' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 27 Oct 2014 07:40:06 +0000 (07:40 +0000)]
Merge branch 'MDL-47734-master-fixes' of git://github.com/andrewnicols/moodle

7 years agoMDL-47676 core_grades: reset is hidden in menu, using proper step
Rajesh Taneja [Mon, 27 Oct 2014 07:21:11 +0000 (15:21 +0800)]
MDL-47676 core_grades: reset is hidden in menu, using proper step

7 years agoMerge branch 'm28_MDL-47210_IIS_PATH_INFO_Ignored_In_Required_Login_Pluginfile_Redire...
Damyon Wiese [Mon, 27 Oct 2014 05:58:15 +0000 (13:58 +0800)]
Merge branch 'm28_MDL-47210_IIS_PATH_INFO_Ignored_In_Required_Login_Pluginfile_Redirect' of https://github.com/scara/moodle

7 years agoMDL-46215 mod_forum: Improve style of subscription state
Andrew Nicols [Mon, 27 Oct 2014 03:14:33 +0000 (11:14 +0800)]
MDL-46215 mod_forum: Improve style of subscription state

With the implementation of per-discussion subscription, the current
discussion's subscription state must be shown.

Since this state belongs to the discussion rather than the forum, it
should be shown accordingly.  This change therefore includes the addition
of the discussion name as a heading on the page.

7 years agoMDL-47833 core: Change default expiry for message inbound handlers
Dave Cooper [Fri, 24 Oct 2014 02:54:45 +0000 (10:54 +0800)]
MDL-47833 core: Change default expiry for message inbound handlers

7 years agoMerge branch 'MDL-47850-master' of git://github.com/jleyva/moodle
Marina Glancy [Mon, 27 Oct 2014 03:52:35 +0000 (11:52 +0800)]
Merge branch 'MDL-47850-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2...
Marina Glancy [Mon, 27 Oct 2014 03:52:18 +0000 (11:52 +0800)]
Merge branch 'MDL-47882_scorm_loadsco_invalid_html' of git://github.com/MorrisR2/moodle

7 years agoMDL-47690 Course: Remove unused variable from unit tests.
Damyon Wiese [Mon, 27 Oct 2014 03:26:35 +0000 (11:26 +0800)]
MDL-47690 Course: Remove unused variable from unit tests.

7 years agoMDL-47734 core: Do not set scrolltop on fixed dialogues
Andrew Nicols [Mon, 27 Oct 2014 03:22:30 +0000 (11:22 +0800)]
MDL-47734 core: Do not set scrolltop on fixed dialogues

Fixed position dialogues use a different xy positioning than standard
dialogues so cannot use the scrollTop positioning method.

7 years agoMerge branch 'MDL-47690-master' of git://github.com/jleyva/moodle
Damyon Wiese [Mon, 27 Oct 2014 03:11:53 +0000 (11:11 +0800)]
Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'wip-MDL-30358-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 27 Oct 2014 02:30:44 +0000 (10:30 +0800)]
Merge branch 'wip-MDL-30358-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-47210 Files API: IIS, PATH_INFO ignored in required login redirect.
Matteo Scaramuccia [Sat, 4 Oct 2014 12:14:44 +0000 (14:14 +0200)]
MDL-47210 Files API: IIS, PATH_INFO ignored in required login redirect.

7 years agoMDL-47882 SCORM: invalid HTML in loadSCO.php
Ray Morris [Fri, 24 Oct 2014 21:45:32 +0000 (16:45 -0500)]
MDL-47882 SCORM: invalid HTML in loadSCO.php

7 years agoMerge branch 'MDL-46088-master' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 24 Oct 2014 16:10:56 +0000 (17:10 +0100)]
Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-47545-master' of git://github.com/jleyva/moodle
Dan Poltawski [Fri, 24 Oct 2014 15:40:06 +0000 (16:40 +0100)]
Merge branch 'MDL-47545-master' of git://github.com/jleyva/moodle

7 years agoMDL-47545 web services: Allow cross origin requests for file downloads
Juan Leyva [Tue, 14 Oct 2014 09:59:47 +0000 (11:59 +0200)]
MDL-47545 web services: Allow cross origin requests for file downloads

7 years agoMerge branch 'MDL-46712-master' of git://github.com/jethac/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)]
Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-47782-master' of git://github.com/lameze/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:25:42 +0000 (15:25 +0100)]
Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle

Conflicts:
admin/tool/monitor/lang/en/tool_monitor.php

7 years agoMerge branch 'MDL-47780_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:19:48 +0000 (15:19 +0100)]
Merge branch 'MDL-47780_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:18:32 +0000 (15:18 +0100)]
Merge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch '46518-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:16:55 +0000 (15:16 +0100)]
Merge branch '46518-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-47804' of git://github.com/aolley/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:14:53 +0000 (15:14 +0100)]
Merge branch 'MDL-47804' of git://github.com/aolley/moodle

7 years agoMerge branch '47608-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:12:59 +0000 (15:12 +0100)]
Merge branch '47608-28' of git://github.com/samhemelryk/moodle

7 years agoMDL-47397 assignfeedback_editpdf: Copy stamps to other students in team
Frederic Massart [Thu, 23 Oct 2014 09:37:52 +0000 (17:37 +0800)]
MDL-47397 assignfeedback_editpdf: Copy stamps to other students in team

During a team submission the stamps were attached to the user that
was graded and not to the other users. This could lead to errors when
generating the PDF for each user.

7 years agoMDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF
Frederic Massart [Thu, 23 Oct 2014 09:35:41 +0000 (17:35 +0800)]
MDL-47397 assignfeedback_editpdf: Tests use reliable way to annotate PDF

The drag and drop step did not work, so we moved to using the stamps
to annotate the PDF. They do not rely on drag&drop and produce the same
effects.

7 years agoMDL-47397 editor_atto: Properly close confirm dialogue in Behat test
Frederic Massart [Thu, 23 Oct 2014 07:15:34 +0000 (15:15 +0800)]
MDL-47397 editor_atto: Properly close confirm dialogue in Behat test

7 years agoMerge branch 'MDL-47778_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 24 Oct 2014 13:53:21 +0000 (14:53 +0100)]
Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle

7 years agoMDL-47802 mod_forum: Check for required subscription capabilities
Andrew Nicols [Fri, 24 Oct 2014 00:08:56 +0000 (08:08 +0800)]
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.

7 years agoMDL-47802 mod_forum: Include discussion subscriptions when moving
Andrew Nicols [Wed, 22 Oct 2014 03:31:40 +0000 (11:31 +0800)]
MDL-47802 mod_forum: Include discussion subscriptions when moving

Check for both forum, and discussion subscriptions when moving a discussion
to a different forum.

7 years agoMDL-47873 gradebook: Fix for missing override checkboxes.
Zachary Durber [Fri, 24 Oct 2014 08:54:01 +0000 (16:54 +0800)]
MDL-47873 gradebook: Fix for missing override checkboxes.

7 years agoMerge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle
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

7 years agoMerge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle
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

7 years agoMerge branch 'MDL-47734-master' of git://github.com/andrewnicols/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

7 years agoon-demand release 2.8beta+
Dan Poltawski [Fri, 24 Oct 2014 10:15:32 +0000 (11:15 +0100)]
on-demand release 2.8beta+

7 years agoMerge branch 'wip-MDL-47542-master' of git://github.com/marinaglancy/moodle
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

7 years agoMDL-47542 core_grades: action menu for grade setup
Marina Glancy [Tue, 14 Oct 2014 06:53:28 +0000 (14:53 +0800)]
MDL-47542 core_grades: action menu for grade setup

7 years agoMerge branch 'MDL-47813-master' of git://github.com/xow/moodle
Marina Glancy [Fri, 24 Oct 2014 08:22:12 +0000 (16:22 +0800)]
Merge branch 'MDL-47813-master' of git://github.com/xow/moodle

7 years agoMDL-47813 tool_monitor: Fix rule manager unit tests in oracle
John Okely [Fri, 24 Oct 2014 02:38:30 +0000 (10:38 +0800)]
MDL-47813 tool_monitor: Fix rule manager unit tests in oracle

7 years agoMDL-47704 Grades: Behat fix - dropped items have no contribution
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 %"

7 years agoMerge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle
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

7 years agoMerge branch 'MDL-47838-master-fix3' of https://github.com/damyon/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

7 years agoMDL-47637 core_grades: Remove extra credit field in outcome test
Frederic Massart [Fri, 24 Oct 2014 07:32:50 +0000 (15:32 +0800)]
MDL-47637 core_grades: Remove extra credit field in outcome test

7 years agoMDL-47513 theme_base: Fix grader report when blocks are docked
Andrew Nicols [Fri, 24 Oct 2014 04:34:20 +0000 (12:34 +0800)]
MDL-47513 theme_base: Fix grader report when blocks are docked

7 years agoMDL-47838 gradereport_singleview: Reuse get_element_header instead of rolling our...
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.

7 years agoMerge branch 'MDL-47340-master' of git://github.com/jethac/moodle
Marina Glancy [Fri, 24 Oct 2014 03:54:42 +0000 (11:54 +0800)]
Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-47838-master' of git://github.com/zbdd/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

7 years agoMerge branch '46499-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Fri, 24 Oct 2014 01:56:55 +0000 (09:56 +0800)]
Merge branch '46499-28' of git://github.com/samhemelryk/moodle

7 years agoMDL-47838 gradebook: Singleview fix for invalid links.
Zachary Durber [Thu, 23 Oct 2014 03:53:42 +0000 (11:53 +0800)]
MDL-47838 gradebook: Singleview fix for invalid links.

7 years agoMDL-46332 fixed whitespace
Sam Hemelryk [Fri, 24 Oct 2014 01:34:36 +0000 (14:34 +1300)]
MDL-46332 fixed whitespace

7 years agoMerge branch 'MDL-46332-grouping-remove-button-master' of git://github.com/DanBennett...
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

7 years agoMerge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/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

7 years agoMerge branch 'MDL-47738-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'm28_MDL-47632' of https://github.com/totara/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

7 years agoMerge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
Sam Hemelryk [Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)]
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle

7 years agoMerge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/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

7 years agoMDL-46853 calendar: fix import of no duration events
gdharris [Fri, 15 Aug 2014 19:31:48 +0000 (15:31 -0400)]
MDL-46853 calendar: fix import of no duration events

7 years agoMerge branch 'MDL-47791' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 23 Oct 2014 16:30:28 +0000 (17:30 +0100)]
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-47815-master' of git://github.com/damyon/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

7 years agoMDL-47815 assign: Fix random unit test fails
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).

7 years agoMerge branch 'MDL-47847-master' of git://github.com/jleyva/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

7 years agoMDL-47847 Web Services: Add messaging functions to the mobile service
Juan Leyva [Thu, 23 Oct 2014 13:24:07 +0000 (15:24 +0200)]
MDL-47847 Web Services: Add messaging functions to the mobile service

7 years agoMerge branch '47752-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)]
Merge branch '47752-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '47684-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

7 years agoMerge branch 'MDL-47513-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-47637-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-47814-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

7 years agoMDL-47814 core_grades: Improved coverage of user_graded event tests
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.

7 years agoMerge branch 'MDL-47767-master' of git://github.com/xow/moodle
Dan Poltawski [Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)]
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle

7 years agoMDL-47767 tool_monitor: Use renderers for links between subscription and rule managers
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

7 years agoMerge branch 'MDL-20367-master' of git://github.com/damyon/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

7 years agoMDL-47767 tool_monitor: Add links between subscribe and rule manager
John Okely [Mon, 20 Oct 2014 09:01:08 +0000 (17:01 +0800)]
MDL-47767 tool_monitor: Add links between subscribe and rule manager

7 years agoMerge branch 'MDL-47499-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

7 years agoMerge branch 'MDL-47808-master' of git://github.com/andrewnicols/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

7 years agoMerge branch 'MDL-47689-master' of git://github.com/gurgus/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

7 years agoMDL-47689 user: Add duplicate field check to avoid oracle db error.
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.

7 years agoMerge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/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

7 years agoMerge branch 'MDL-47759-master' of git://github.com/ankitagarwal/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

7 years agoMerge branch '47077-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Thu, 23 Oct 2014 08:09:29 +0000 (16:09 +0800)]
Merge branch '47077-28' of git://github.com/samhemelryk/moodle

7 years agoMDL-47762 gradereport_user: Hide contribution and weights when relevant
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.

7 years agoMerge branch 'MDL-47153_master' of https://github.com/markn86/moodle
Damyon Wiese [Thu, 23 Oct 2014 07:47:10 +0000 (15:47 +0800)]
Merge branch 'MDL-47153_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-47704-master' of git://github.com/damyon/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

7 years agoMerge branch 'MDL-47763-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

7 years agoMerge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/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

7 years agoMDL-47763 Grades: Handle the case when a grade category is hidden.
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.

7 years agoMerge branch 'MDL-47836-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 23 Oct 2014 07:23:52 +0000 (15:23 +0800)]
Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle

7 years agoMDL-43245 mod_lesson: Add string for essay grading permission.
Adrian Greeve [Thu, 23 Oct 2014 07:05:32 +0000 (15:05 +0800)]
MDL-43245 mod_lesson: Add string for essay grading permission.

7 years agoMerge branch 'MDL-47819-master' of git://github.com/jethac/moodle
Marina Glancy [Thu, 23 Oct 2014 07:21:28 +0000 (15:21 +0800)]
Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle

7 years agoMDL-47836 Grades: Fix the url for the upgraded grades warning page url.
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.

7 years agoMerge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle
Dan Poltawski [Thu, 23 Oct 2014 07:18:31 +0000 (08:18 +0100)]
Merge branch 'MDL-47713-master-fix1' of github.com/damyon/moodle

7 years agoMDL-47819 user_menu: fixed showing up in popups
Jetha Chan [Thu, 23 Oct 2014 03:58:11 +0000 (11:58 +0800)]
MDL-47819 user_menu: fixed showing up in popups

7 years agoMerge branch 'MDL-47740' of git://github.com/timhunt/moodle
Damyon Wiese [Thu, 23 Oct 2014 06:24:47 +0000 (14:24 +0800)]
Merge branch 'MDL-47740' of git://github.com/timhunt/moodle

7 years agoMDL-47713 Grades: Fix new behat test after conversion from points to %
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 %.

7 years agoMerge branch 'MDL-43245' of git://github.com/jmvedrine/moodle
Damyon Wiese [Thu, 23 Oct 2014 05:52:15 +0000 (13:52 +0800)]
Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle

7 years agoMDL-43245 Lesson: non editing teacher cannot grade lesson essay
Jean-Michel Vedrine [Thu, 16 Oct 2014 19:46:27 +0000 (21:46 +0200)]
MDL-43245 Lesson: non editing teacher cannot grade lesson essay

7 years agoMerge branch 'MDL-47713-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)]
Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle