Dan Poltawski [Thu, 30 Oct 2014 08:30:43 +0000 (08:30 +0000)]
Merge branch 'wip-MDL-47919-master2' of https://github.com/marinaglancy/moodle
Marina Glancy [Thu, 30 Oct 2014 08:15:51 +0000 (16:15 +0800)]
Merge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/moodle
Marina Glancy [Thu, 30 Oct 2014 08:15:38 +0000 (16:15 +0800)]
Merge branch '47970-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Thu, 30 Oct 2014 08:15:10 +0000 (16:15 +0800)]
Merge branch 'MDL-47909-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 30 Oct 2014 06:22:48 +0000 (14:22 +0800)]
Merge branch 'MDL-47310-master' of git://github.com/jethac/moodle
Marina Glancy [Thu, 30 Oct 2014 06:19:52 +0000 (14:19 +0800)]
Merge branch 'MDL-47349-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 30 Oct 2014 06:17:32 +0000 (14:17 +0800)]
Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle
Marina Glancy [Thu, 30 Oct 2014 06:03:10 +0000 (14:03 +0800)]
MDL-47919 tool_monitor: refer to fields by labels in behat
Andrew Nicols [Mon, 27 Oct 2014 23:51:10 +0000 (07:51 +0800)]
MDL-47909 mod_forum: Respect user autosubscribe setting on post
Re-appropriate the forum autosubscribe setting as a discussion
autosubscribe setting.
The setting was no longer used after the per-discussion changes. The
original plan had been to remove this setting, but there is some benefit to
respecting it for discussion subscriptions instead.
Jetha Chan [Thu, 30 Oct 2014 05:28:15 +0000 (13:28 +0800)]
MDL-47310 gradebook: accessibility improvements
Rajesh Taneja [Thu, 30 Oct 2014 01:56:36 +0000 (09:56 +0800)]
MDL-47960 behat: Fixed message node navigation
in i_send_message_to_user, we should use navigation node
step, as there might be multiple links with same name.
Dan Poltawski [Wed, 29 Oct 2014 15:58:22 +0000 (15:58 +0000)]
MDL-47960 messages: behat failures caused by user menu
Dan Poltawski [Wed, 29 Oct 2014 15:57:17 +0000 (15:57 +0000)]
MDL-47960 badges: behat failures caused by usermenu
Dan Poltawski [Wed, 29 Oct 2014 15:42:12 +0000 (15:42 +0000)]
MDL-47960 behat: fix my private files navigation
Caused by the my private files link being in user menu too..
Sam Hemelryk [Thu, 30 Oct 2014 01:23:59 +0000 (14:23 +1300)]
MDL-47970 mod_scorm: fixed HTML5 validation error
Andrew Nicols [Wed, 15 Oct 2014 01:33:52 +0000 (09:33 +0800)]
MDL-47349 gradereport: Use category title on report
Dan Poltawski [Wed, 29 Oct 2014 13:04:46 +0000 (13:04 +0000)]
Merge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/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
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
Dan Poltawski [Wed, 29 Oct 2014 11:20:29 +0000 (11:20 +0000)]
MDL-47368 fix trailing whitespace
Dan Poltawski [Wed, 29 Oct 2014 11:18:15 +0000 (11:18 +0000)]
Merge branch 'MDL-47368' of git://github.com/timhunt/moodle
Julien Boulen [Wed, 8 Oct 2014 11:56:31 +0000 (13:56 +0200)]
MDL-47584 database SQL: add debug info on connection error notices
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
Marina Glancy [Wed, 29 Oct 2014 08:15:07 +0000 (16:15 +0800)]
Merge branch 'MDL-47916-master' of git://github.com/jleyva/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
Damyon Wiese [Wed, 29 Oct 2014 07:37:47 +0000 (15:37 +0800)]
Merge branch 'MDL-46219' of https://github.com/dkns/moodle
Damyon Wiese [Wed, 29 Oct 2014 07:31:58 +0000 (15:31 +0800)]
Merge branch 'MDL-47755_master' of https://github.com/totara/openbadges
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
Damyon Wiese [Wed, 29 Oct 2014 06:46:06 +0000 (14:46 +0800)]
Merge branch 'MDL-47805-master' of git://github.com/ankitagarwal/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
Damyon Wiese [Wed, 29 Oct 2014 06:24:28 +0000 (14:24 +0800)]
Merge branch 'MDL-47201-master' of git://github.com/xow/moodle
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.
Jetha Chan [Wed, 29 Oct 2014 05:46:46 +0000 (13:46 +0800)]
MDL-47945 mod_forum: neighbour links at bottom of discussion
Damyon Wiese [Wed, 29 Oct 2014 05:36:17 +0000 (13:36 +0800)]
Merge branch 'MDL-47898-master' of git://github.com/andrewnicols/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
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
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
Andrea Bicciolo [Wed, 29 Oct 2014 04:44:16 +0000 (12:44 +0800)]
MDL-47201 Reports: Read from multiple log stores in outline report
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.
Damyon Wiese [Wed, 29 Oct 2014 03:19:46 +0000 (11:19 +0800)]
Merge branch 'MDL-47835_master' of git://github.com/dmonllao/moodle
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.
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
Corey Wallis [Fri, 17 Oct 2014 03:58:49 +0000 (14:28 +1030)]
MDL-46517 calendar: adjust dates for DST
Change-Id: I269382031e4ffa714396f3d9ce2315a5c96d929c
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
Petr Skoda [Tue, 28 Oct 2014 21:36:59 +0000 (10:36 +1300)]
MDL-40949 admin: Fix $CFG->preventexecpath hints
This setting restricts all local paths, not just
executables.
Tim Hunt [Tue, 28 Oct 2014 18:45:17 +0000 (18:45 +0000)]
MDL-47368 quiz editing: fix icon url generation.
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
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.
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
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
Marina Glancy [Tue, 28 Oct 2014 09:17:00 +0000 (17:17 +0800)]
MDL-47919 tool_monitor: adjustments to behat tests
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
Pau Ferrer Ocaña [Tue, 28 Oct 2014 07:34:01 +0000 (08:34 +0100)]
MDL-47227 admin: Fix user bulk selection over 1000
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
Juan Leyva [Mon, 27 Oct 2014 22:14:13 +0000 (23:14 +0100)]
MDL-47916 web services: Fixed invalid returned value type
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
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.
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.
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
