Simey Lameze [Fri, 31 Oct 2014 06:43:07 +0000 (14:43 +0800)]
MDL-47892 tool_monitor: add count_rule_subscriptions method and unit tests
Simey Lameze [Fri, 31 Oct 2014 06:41:24 +0000 (14:41 +0800)]
MDL-47892 tool_monitor: disable plugin and event fields if theres subscriptions for the rule
Dan Poltawski [Tue, 28 Oct 2014 12:32:50 +0000 (12:32 +0000)]
on-demand release 2.8beta+
Dan Poltawski [Tue, 28 Oct 2014 12:32:48 +0000 (12:32 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 28 Oct 2014 12:25:27 +0000 (12:25 +0000)]
Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 28 Oct 2014 12:21:30 +0000 (12:21 +0000)]
MDL-47703 fix trailing whitespace
Dan Poltawski [Tue, 28 Oct 2014 11:40:27 +0000 (11:40 +0000)]
Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 28 Oct 2014 09:55:06 +0000 (17:55 +0800)]
Merge branch 'MDL-47889-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 28 Oct 2014 09:26:57 +0000 (17:26 +0800)]
Merge branch 'wip-mdl-47850-m' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 27 Oct 2014 08:00:08 +0000 (16:00 +0800)]
MDL-47877 mod_forum: Correct subscription options for forums
Test was the wrong way around when checking subscription state.
Marina Glancy [Tue, 28 Oct 2014 07:37:05 +0000 (15:37 +0800)]
Merge branch 'MDL-46215-master-fixes' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 28 Oct 2014 06:27:05 +0000 (14:27 +0800)]
MDL-46215 mod_forum: Only add text on discussion view
Do not show the status text in the thread list.
Frederic Massart [Mon, 27 Oct 2014 09:02:03 +0000 (17:02 +0800)]
MDL-47889 tool_monitor: Test handles random DB ordering
On Oracle, the subscriptions are not ordered in the same way
than in other DB engines, so we do not rely on that ordering
any more in the test.
Rajesh Taneja [Tue, 28 Oct 2014 05:24:03 +0000 (13:24 +0800)]
MDL-47850 message_airnotifier: Fixed airnotifier web service url
Sam Hemelryk [Tue, 28 Oct 2014 04:27:09 +0000 (17:27 +1300)]
Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 28 Oct 2014 04:23:33 +0000 (12:23 +0800)]
Merge branch '47914-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 28 Oct 2014 04:23:23 +0000 (12:23 +0800)]
Merge branch 'MDL-814-master' of git://github.com/danpoltawski/moodle
Ankit Agarwal [Mon, 27 Oct 2014 02:30:49 +0000 (08:00 +0530)]
MDL-47870 tool_monitor: Fix event select dropdown
Damyon Wiese [Tue, 28 Oct 2014 03:05:47 +0000 (11:05 +0800)]
MDL-47559 User menu: version bump for new settings
Sam Hemelryk [Tue, 28 Oct 2014 02:19:28 +0000 (15:19 +1300)]
MDL-47183 post-integration fixes
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
Damyon Wiese [Tue, 28 Oct 2014 01:59:04 +0000 (09:59 +0800)]
Merge branch 'MDL-47559-master' of git://github.com/jethac/moodle
Sam Hemelryk [Tue, 28 Oct 2014 01:02:19 +0000 (14:02 +1300)]
Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 27 Oct 2014 22:22:51 +0000 (11:22 +1300)]
MDL-47914 report_stats: better handling of user and mode
Marina Glancy [Thu, 9 Oct 2014 06:35:15 +0000 (14:35 +0800)]
MDL-47585 stats: fixed incorrect user dropdown
Dan Poltawski [Mon, 27 Oct 2014 16:24:57 +0000 (16:24 +0000)]
MDL-814 forum: provide cancel button when posting
This is the way to clear atto drafts
AMOS bot [Mon, 27 Oct 2014 16:05:34 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 27 Oct 2014 14:51:04 +0000 (14:51 +0000)]
Merge branch 'MDL-46215-master' of git://github.com/andrewnicols/moodle
Jetha Chan [Mon, 27 Oct 2014 07:17:25 +0000 (15:17 +0800)]
MDL-47559 user_menu: customusermenu setting
Dan Poltawski [Mon, 27 Oct 2014 08:01:33 +0000 (08:01 +0000)]
Merge branch 'MDL-47839-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 24 Oct 2014 04:35:31 +0000 (12:35 +0800)]
MDL-47839 core_grades: Minor styling improvements to setup/user report
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
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
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
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
Frederic Massart [Thu, 16 Oct 2014 09:42:28 +0000 (17:42 +0800)]
MDL-47703 core_grades: Behat test for (non) aggregated scales
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.
Dave Cooper [Fri, 24 Oct 2014 02:54:45 +0000 (10:54 +0800)]
MDL-47833 core: Change default expiry for message inbound handlers
Marina Glancy [Mon, 27 Oct 2014 03:52:35 +0000 (11:52 +0800)]
Merge branch 'MDL-47850-master' of git://github.com/jleyva/moodle
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
Damyon Wiese [Mon, 27 Oct 2014 03:26:35 +0000 (11:26 +0800)]
MDL-47690 Course: Remove unused variable from unit tests.
Frederic Massart [Thu, 16 Oct 2014 03:12:44 +0000 (11:12 +0800)]
MDL-47703 core_grades: Prevent use of weights with non-aggregated scales
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.
Damyon Wiese [Mon, 27 Oct 2014 03:11:53 +0000 (11:11 +0800)]
Merge branch 'MDL-47690-master' of git://github.com/jleyva/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
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.
Ray Morris [Fri, 24 Oct 2014 21:45:32 +0000 (16:45 -0500)]
MDL-47882 SCORM: invalid HTML in loadSCO.php
Dan Poltawski [Fri, 24 Oct 2014 16:10:56 +0000 (17:10 +0100)]
Merge branch 'MDL-46088-master' of git://github.com/timhunt/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
Juan Leyva [Tue, 14 Oct 2014 09:59:47 +0000 (11:59 +0200)]
MDL-47545 web services: Allow cross origin requests for file downloads
Dan Poltawski [Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)]
Merge branch 'MDL-46712-master' of git://github.com/jethac/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
Dan Poltawski [Fri, 24 Oct 2014 14:19:48 +0000 (15:19 +0100)]
Merge branch 'MDL-47780_master' of https://github.com/markn86/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
Dan Poltawski [Fri, 24 Oct 2014 14:16:55 +0000 (15:16 +0100)]
Merge branch '46518-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:14:53 +0000 (15:14 +0100)]
Merge branch 'MDL-47804' of git://github.com/aolley/moodle
Dan Poltawski [Fri, 24 Oct 2014 14:12:59 +0000 (15:12 +0100)]
Merge branch '47608-28' of git://github.com/samhemelryk/moodle
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.
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.
Frederic Massart [Thu, 23 Oct 2014 07:15:34 +0000 (15:15 +0800)]
MDL-47397 editor_atto: Properly close confirm dialogue in Behat test
Dan Poltawski [Fri, 24 Oct 2014 13:53:21 +0000 (14:53 +0100)]
Merge branch 'MDL-47778_master' of https://github.com/markn86/moodle
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.
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.
Zachary Durber [Fri, 24 Oct 2014 08:54:01 +0000 (16:54 +0800)]
MDL-47873 gradebook: Fix for missing override checkboxes.
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.
