moodle.git
7 years agoMerge branch 'MDL-47945-master' of git://github.com/jethac/moodle
Dan Poltawski [Wed, 29 Oct 2014 12:56:03 +0000 (12:56 +0000)]
Merge branch 'MDL-47945-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'wip-MDL-47919-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 29 Oct 2014 12:42:55 +0000 (12:42 +0000)]
Merge branch 'wip-MDL-47919-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-47368 fix trailing whitespace
Dan Poltawski [Wed, 29 Oct 2014 11:20:29 +0000 (11:20 +0000)]
MDL-47368 fix trailing whitespace

7 years agoMerge branch 'MDL-47368' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 29 Oct 2014 11:18:15 +0000 (11:18 +0000)]
Merge branch 'MDL-47368' of git://github.com/timhunt/moodle

7 years agoMDL-47584 database SQL: add debug info on connection error notices
Julien Boulen [Wed, 8 Oct 2014 11:56:31 +0000 (13:56 +0200)]
MDL-47584 database SQL: add debug info on connection error notices

7 years agoMerge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 29 Oct 2014 08:18:03 +0000 (16:18 +0800)]
Merge branch 'wip-MDL-47647-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-47916-master' of git://github.com/jleyva/moodle
Marina Glancy [Wed, 29 Oct 2014 08:15:07 +0000 (16:15 +0800)]
Merge branch 'MDL-47916-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-47946-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 29 Oct 2014 07:53:17 +0000 (15:53 +0800)]
Merge branch 'MDL-47946-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-46219' of https://github.com/dkns/moodle
Damyon Wiese [Wed, 29 Oct 2014 07:37:47 +0000 (15:37 +0800)]
Merge branch 'MDL-46219' of https://github.com/dkns/moodle

7 years agoMerge branch 'MDL-47755_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)]
Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges

7 years agoMerge branch 'wip-MDL-47796-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 29 Oct 2014 07:15:14 +0000 (15:15 +0800)]
Merge branch 'wip-MDL-47796-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-47805-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 29 Oct 2014 06:46:06 +0000 (14:46 +0800)]
Merge branch 'MDL-47805-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle
Damyon Wiese [Wed, 29 Oct 2014 06:44:08 +0000 (14:44 +0800)]
Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle

7 years agoMerge branch 'MDL-47201-master' of git://github.com/xow/moodle
Damyon Wiese [Wed, 29 Oct 2014 06:24:28 +0000 (14:24 +0800)]
Merge branch 'MDL-47201-master' of git://github.com/xow/moodle

7 years agoMDL-47796 mod_data: Fix display of group records.
Adrian Greeve [Wed, 29 Oct 2014 05:52:29 +0000 (13:52 +0800)]
MDL-47796 mod_data: Fix display of group records.

When viewing entries as a teacher in separate group
mode, changing the group would result in random
entries being shown.

7 years agoMDL-47945 mod_forum: neighbour links at bottom of discussion
Jetha Chan [Wed, 29 Oct 2014 05:46:46 +0000 (13:46 +0800)]
MDL-47945 mod_forum: neighbour links at bottom of discussion

7 years agoMerge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 29 Oct 2014 05:36:17 +0000 (13:36 +0800)]
Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'master_MDL-33939' of https://github.com/danmarsden/moodle
Damyon Wiese [Wed, 29 Oct 2014 05:23:28 +0000 (13:23 +0800)]
Merge branch 'master_MDL-33939' of https://github.com/danmarsden/moodle

7 years agoMerge branch 'wip-MDL-46517-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 29 Oct 2014 05:01:35 +0000 (13:01 +0800)]
Merge branch 'wip-MDL-46517-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle
Damyon Wiese [Wed, 29 Oct 2014 04:53:21 +0000 (12:53 +0800)]
Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle

Conflicts:
mod/forum/styles.css

7 years agoMDL-47201 Reports: Read from multiple log stores in outline report
Andrea Bicciolo [Wed, 29 Oct 2014 04:44:16 +0000 (12:44 +0800)]
MDL-47201 Reports: Read from multiple log stores in outline report

7 years agoMDL-47946 mod_forum: Correct strings in behat features
Andrew Nicols [Wed, 29 Oct 2014 04:01:41 +0000 (12:01 +0800)]
MDL-47946 mod_forum: Correct strings in behat features

These are a regression from MDL-46215.

7 years agoMerge branch 'MDL-47835_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Wed, 29 Oct 2014 03:19:46 +0000 (11:19 +0800)]
Merge branch 'MDL-47835_master' of git://github.com/dmonllao/moodle

7 years agoMDL-47835 block_recent_activity: Same entry keys order
David Monllao [Mon, 27 Oct 2014 07:40:39 +0000 (15:40 +0800)]
MDL-47835 block_recent_activity: Same entry keys order

insert_records() is sensitive to the order of the keys
assigned to the inserted objects (inserted as arrays in
this case). Now keys are assigned using the same order.

7 years agoMDL-46517 calendar: adjust display for DST
Marina Glancy [Wed, 29 Oct 2014 02:30:54 +0000 (10:30 +0800)]
MDL-46517 calendar: adjust display for DST

Thanks to Jo Matthews for providing a patch

7 years agoMDL-46517 calendar: adjust dates for DST
Corey Wallis [Fri, 17 Oct 2014 03:58:49 +0000 (14:28 +1030)]
MDL-46517 calendar: adjust dates for DST

Change-Id: I269382031e4ffa714396f3d9ce2315a5c96d929c

7 years agoMerge branch 'wip-MDL-36987-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 29 Oct 2014 02:20:47 +0000 (10:20 +0800)]
Merge branch 'wip-MDL-36987-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-47368 quiz editing: fix icon url generation.
Tim Hunt [Tue, 28 Oct 2014 18:45:17 +0000 (18:45 +0000)]
MDL-47368 quiz editing: fix icon url generation.

7 years agoon-demand release 2.8beta+
Dan Poltawski [Tue, 28 Oct 2014 12:32:50 +0000 (12:32 +0000)]
on-demand release 2.8beta+

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

7 years agoMerge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 28 Oct 2014 12:25:27 +0000 (12:25 +0000)]
Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-47703 fix trailing whitespace
Dan Poltawski [Tue, 28 Oct 2014 12:21:30 +0000 (12:21 +0000)]
MDL-47703  fix trailing whitespace

7 years agoMerge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 28 Oct 2014 11:40:27 +0000 (11:40 +0000)]
Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle

7 years agoMDL-47368 core JS: dragdrop click move fills the dom with divs
Tim Hunt [Mon, 27 Oct 2014 17:26:40 +0000 (17:26 +0000)]
MDL-47368 core JS: dragdrop click move fills the dom with divs

Every time you click the move icon, it builds a new dialogue with a list
of drop targets, but it never discards the old ones. Not only does this
fill the DOM with junk, but it also causes Behat tests to fail, since
the old dialogues come first, and are hidden, but contain links with the
same text that you are trying to click.

7 years agoMDL-47368 Edit quiz: page should not reload so often
Colin Chambers [Tue, 14 Oct 2014 14:41:48 +0000 (15:41 +0100)]
MDL-47368 Edit quiz: page should not reload so often

The approach is that we have a new JavaScript function
M.mod_quiz.resource_toolbox.reorganise_edit_page which, after a ajax
action, fixes up everything like page breaks, page and question numbers,
that might now be wrong.

We call that function instead of reloading the page.

Also, there are a lot more Behat tests to verify this works correctly.

AMOS BEGIN
 MOV [joinpages,mod_quiz],[removepagebreak,mod_quiz]
 MOV [splitpages,mod_quiz],[addpagebreak,mod_quiz]
AMOS END

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

7 years agoMerge branch 'wip-mdl-47850-m' of git://github.com/rajeshtaneja/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

7 years agoMDL-47919 tool_monitor: adjustments to behat tests
Marina Glancy [Tue, 28 Oct 2014 09:17:00 +0000 (17:17 +0800)]
MDL-47919 tool_monitor: adjustments to behat tests

7 years agoMDL-47877 mod_forum: Correct subscription options for forums
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.

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

7 years agoMDL-47227 admin: Fix user bulk selection over 1000
Pau Ferrer Ocaña [Tue, 28 Oct 2014 07:34:01 +0000 (08:34 +0100)]
MDL-47227 admin: Fix user bulk selection over 1000

7 years agoMDL-46215 mod_forum: Only add text on discussion view
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.

7 years agoMDL-47889 tool_monitor: Test handles random DB ordering
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.

7 years agoMDL-47850 message_airnotifier: Fixed airnotifier web service url
Rajesh Taneja [Tue, 28 Oct 2014 05:24:03 +0000 (13:24 +0800)]
MDL-47850 message_airnotifier: Fixed airnotifier web service url

7 years agoMerge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 28 Oct 2014 04:27:09 +0000 (17:27 +1300)]
Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch '47914-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 28 Oct 2014 04:23:33 +0000 (12:23 +0800)]
Merge branch '47914-28' of git://github.com/samhemelryk/moodle

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

7 years agoMDL-47870 tool_monitor: Fix event select dropdown
Ankit Agarwal [Mon, 27 Oct 2014 02:30:49 +0000 (08:00 +0530)]
MDL-47870 tool_monitor: Fix event select dropdown

7 years agoMDL-47559 User menu: version bump for new settings
Damyon Wiese [Tue, 28 Oct 2014 03:05:47 +0000 (11:05 +0800)]
MDL-47559 User menu: version bump for new settings

7 years agoMDL-47183 post-integration fixes
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()

7 years agoMerge branch 'MDL-47559-master' of git://github.com/jethac/moodle
Damyon Wiese [Tue, 28 Oct 2014 01:59:04 +0000 (09:59 +0800)]
Merge branch 'MDL-47559-master' of git://github.com/jethac/moodle

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

7 years agoMDL-47914 report_stats: better handling of user and mode
Sam Hemelryk [Mon, 27 Oct 2014 22:22:51 +0000 (11:22 +1300)]
MDL-47914 report_stats: better handling of user and mode

7 years agoMDL-47916 web services: Fixed invalid returned value type
Juan Leyva [Mon, 27 Oct 2014 22:14:13 +0000 (23:14 +0100)]
MDL-47916 web services: Fixed invalid returned value type

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 agoMDL-814 forum: provide cancel button when posting
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

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 27 Oct 2014 16:05:34 +0000 (00:05 +0800)]
Automatically generated installer lang files

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 agoMDL-47559 user_menu: customusermenu setting
Jetha Chan [Mon, 27 Oct 2014 07:17:25 +0000 (15:17 +0800)]
MDL-47559 user_menu: customusermenu setting

7 years agoMDL-47898 mod_quiz: Correct path when checking content_editable
Andrew Nicols [Mon, 27 Oct 2014 11:23:54 +0000 (19:23 +0800)]
MDL-47898 mod_quiz: Correct path when checking content_editable

Addresses a number of issues when using the text editor in a quiz using
secure mode.

7 years agoMDL-47647 lib: Fix message unit test failure.
Adrian Greeve [Mon, 27 Oct 2014 08:35:06 +0000 (16:35 +0800)]
MDL-47647 lib: Fix message unit test failure.

Messaging unit tests on Windows were failing because
of a comparison between two file paths. Part of the
path would have a forward slash instead of a backslash
and so would fail.

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-47703 core_grades: Behat test for (non) aggregated scales
Frederic Massart [Thu, 16 Oct 2014 09:42:28 +0000 (17:42 +0800)]
MDL-47703 core_grades: Behat test for (non) aggregated scales

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-47703 core_grades: Prevent use of weights with non-aggregated scales
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

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+