moodle.git
7 years agoMDL-48020 mod_forum: Add missing sesskey check in AJAX subscription
Andrew Nicols [Mon, 3 Nov 2014 01:25:23 +0000 (09:25 +0800)]
MDL-48020 mod_forum: Add missing sesskey check in AJAX subscription

7 years agoMerge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Mon, 3 Nov 2014 09:21:55 +0000 (17:21 +0800)]
Merge branch 'MDL-47987-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48010' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 3 Nov 2014 09:15:25 +0000 (17:15 +0800)]
Merge branch 'MDL-48010' of git://github.com/timhunt/moodle

7 years agoMDL-47287 prevent web access to phpunit boostrap
Petr Skoda [Thu, 18 Sep 2014 02:29:21 +0000 (14:29 +1200)]
MDL-47287 prevent web access to phpunit boostrap

7 years agoMerge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 3 Nov 2014 09:03:57 +0000 (17:03 +0800)]
Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php
Andreas Grabs [Sun, 26 Oct 2014 19:37:52 +0000 (20:37 +0100)]
MDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php

7 years agoMDL-47926 LTI: Fix missing sesskey checks and add content type headers to redirect
Damyon Wiese [Tue, 28 Oct 2014 09:24:35 +0000 (17:24 +0800)]
MDL-47926 LTI: Fix missing sesskey checks and add content type headers to redirect

7 years agoMerge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 3 Nov 2014 06:10:43 +0000 (14:10 +0800)]
Merge branch 'wip-MDL-45538-master' of git://github.com/marinaglancy/moodle

Conflicts:
version.php

7 years agoMerge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle
Damyon Wiese [Mon, 3 Nov 2014 05:50:38 +0000 (13:50 +0800)]
Merge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle

7 years agoMerge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 3 Nov 2014 04:20:58 +0000 (12:20 +0800)]
Merge branch 'wip_MDL-47966_m28_defaultheaders' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 3 Nov 2014 02:30:08 +0000 (15:30 +1300)]
Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-47465 tool_monitor: Ignore used events
Ankit Agarwal [Fri, 17 Oct 2014 08:03:10 +0000 (13:33 +0530)]
MDL-47465 tool_monitor: Ignore used events

An event that has already contributed to a notification should not contribute to another notification for the same subscription.
This needs to be done so we do not overwhelm the user.

7 years agoMDL-47465 tool_monitor: add a new column to subs
Ankit Agarwal [Fri, 17 Oct 2014 07:46:50 +0000 (13:16 +0530)]
MDL-47465 tool_monitor: add a new column to subs

7 years agoMDL-47978 mod_quiz: more explicit selector for action menu change
Sam Hemelryk [Sun, 2 Nov 2014 22:39:30 +0000 (11:39 +1300)]
MDL-47978 mod_quiz: more explicit selector for action menu change

7 years agoMerge branch 'MDL-47978' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 2 Nov 2014 22:27:55 +0000 (11:27 +1300)]
Merge branch 'MDL-47978' of git://github.com/timhunt/moodle

7 years agoMDL-48010 grade import from URL: don't corrupt the URL.
Tim Hunt [Fri, 31 Oct 2014 19:49:28 +0000 (19:49 +0000)]
MDL-48010 grade import from URL: don't corrupt the URL.

7 years agoMDL-48008 gradeimport_xml: report errors usefully
Tim Hunt [Fri, 31 Oct 2014 19:24:29 +0000 (19:24 +0000)]
MDL-48008 gradeimport_xml: report errors usefully

7 years agoMDL-47978 quiz editing: fix display of last add menu
Tim Hunt [Fri, 31 Oct 2014 18:23:45 +0000 (18:23 +0000)]
MDL-47978 quiz editing: fix display of last add menu

7 years agoMerge branch 'MDL-47892-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Fri, 31 Oct 2014 17:57:30 +0000 (18:57 +0100)]
Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle

7 years agoMDL-47963 quiz editing: fix failing unit tests
Tim Hunt [Fri, 31 Oct 2014 17:18:46 +0000 (17:18 +0000)]
MDL-47963 quiz editing: fix failing unit tests

The unit tests were initialising the structure class in a different way
from real use. That was clearly silly, so I got rid of create_for,
leaving just the real create_for_quiz.

7 years agoMerge branch 'MDL-47797' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 31 Oct 2014 16:48:30 +0000 (16:48 +0000)]
Merge branch 'MDL-47797' of git://github.com/timhunt/moodle

7 years agoMDL-47797 quesion preview: improve the behat script
Tim Hunt [Wed, 22 Oct 2014 10:43:42 +0000 (11:43 +0100)]
MDL-47797 quesion preview: improve the behat script

Tests a few more buttons, and also verify more of the UI.

7 years agoMDL-47797 question preview: show more technical info
Tim Hunt [Tue, 21 Oct 2014 16:27:38 +0000 (17:27 +0100)]
MDL-47797 question preview: show more technical info

It is helpful for developers creating question types (at least) to be
able to see this.

7 years agoMerge branch 'MDL-47963' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 31 Oct 2014 13:14:59 +0000 (13:14 +0000)]
Merge branch 'MDL-47963' of git://github.com/timhunt/moodle

7 years agoon-demand release 2.8beta+
Dan Poltawski [Fri, 31 Oct 2014 09:09:03 +0000 (09:09 +0000)]
on-demand release 2.8beta+

7 years agoMDL-45204 phpunit: Fixed test_localcachedir test
Rajesh Taneja [Fri, 31 Oct 2014 08:07:47 +0000 (16:07 +0800)]
MDL-45204 phpunit: Fixed test_localcachedir test

make_localcache_directory is the first call to make
localcache, which is already created by reset. So deleting
existing localcache directory will pass this test

7 years agoMDL-47919 tool_monitor: only use set_label() on valid object
Mark Nelson [Fri, 31 Oct 2014 07:55:04 +0000 (00:55 -0700)]
MDL-47919 tool_monitor: only use set_label() on valid object

7 years agoMDL-47892 tool_monitor: add count_rule_subscriptions method and unit tests
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

7 years agoMDL-47892 tool_monitor: disable plugin and event fields if theres subscriptions for...
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

7 years agoMDL-47959 mod_quiz: fixed 0 questions bug
Sam Hemelryk [Thu, 30 Oct 2014 22:58:49 +0000 (11:58 +1300)]
MDL-47959 mod_quiz: fixed 0 questions bug

7 years agoMDL-47987 mod_forum: Users subscribe to discussions not forums
Andrew Nicols [Thu, 30 Oct 2014 23:51:48 +0000 (07:51 +0800)]
MDL-47987 mod_forum: Users subscribe to discussions not forums

Correct language string which describes users subscribing to a discussion,
and use it when subscribing on post.

7 years agoMerge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle
Sam Hemelryk [Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)]
Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle

7 years agoMDL-47875 choice: chat module strings not required from Choice anymore
pau.ferrer-ocana [Wed, 29 Oct 2014 08:45:57 +0000 (09:45 +0100)]
MDL-47875 choice: chat module strings not required from Choice anymore

AMOS BEGIN
 CPY [chatintro,mod_chat],[description,mod_choice]
AMOS END

7 years agoMerge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle
Sam Hemelryk [Thu, 30 Oct 2014 21:27:46 +0000 (10:27 +1300)]
Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle

7 years agoMerge branch 'MDL-47972' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 30 Oct 2014 17:31:12 +0000 (17:31 +0000)]
Merge branch 'MDL-47972' of git://github.com/timhunt/moodle

7 years agoMDL-47972 mod_quiz: Fix new quiz on themes based on base.
Colin Chambers [Thu, 30 Oct 2014 11:22:26 +0000 (11:22 +0000)]
MDL-47972 mod_quiz: Fix new quiz on themes based on base.

7 years agoMDL-47950 course: Adding sesskey confirmation when duplicating activities
David Monllao [Wed, 29 Oct 2014 07:00:03 +0000 (15:00 +0800)]
MDL-47950 course: Adding sesskey confirmation when duplicating activities

7 years agoMDL-47918 forum: Coding style fix
Dan Poltawski [Thu, 30 Oct 2014 16:46:46 +0000 (16:46 +0000)]
MDL-47918 forum: Coding style fix

7 years agoMDL-47963 quiz editing: block ajax edits once there are attempts
Tim Hunt [Thu, 30 Oct 2014 16:03:02 +0000 (16:03 +0000)]
MDL-47963 quiz editing: block ajax edits once there are attempts

7 years agoMerge branch 'MDL-47746-master' of git://github.com/zbdd/moodle
Dan Poltawski [Thu, 30 Oct 2014 15:39:46 +0000 (15:39 +0000)]
Merge branch 'MDL-47746-master' of git://github.com/zbdd/moodle

7 years agoMerge branch 'MDL-47896-master' of git://github.com/zbdd/moodle
Dan Poltawski [Thu, 30 Oct 2014 15:15:28 +0000 (15:15 +0000)]
Merge branch 'MDL-47896-master' of git://github.com/zbdd/moodle

7 years agoMerge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 30 Oct 2014 14:31:38 +0000 (14:31 +0000)]
Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-47959' of git://github.com/colchambers/moodle
Dan Poltawski [Thu, 30 Oct 2014 14:24:35 +0000 (14:24 +0000)]
Merge branch 'MDL-47959' of git://github.com/colchambers/moodle

7 years agoMerge branch 'MDL-25057-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 30 Oct 2014 09:14:09 +0000 (17:14 +0800)]
Merge branch 'MDL-25057-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-26447 gradebook: Default gradedisplaytype fixed for all locales
pau.ferrer-ocana [Thu, 30 Oct 2014 08:43:43 +0000 (09:43 +0100)]
MDL-26447 gradebook: Default gradedisplaytype fixed for all locales

7 years agoMerge branch 'wip-MDL-47919-master2' of https://github.com/marinaglancy/moodle
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

7 years agoMerge branch 'MDL-47569_CC_Errors' of git://github.com/moodlerooms/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

7 years agoMerge branch '47970-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Thu, 30 Oct 2014 08:15:38 +0000 (16:15 +0800)]
Merge branch '47970-28' of git://github.com/samhemelryk/moodle

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

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

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

7 years agoMerge branch 'MDL-29873' of git://github.com/jmvedrine/moodle
Marina Glancy [Thu, 30 Oct 2014 06:17:32 +0000 (14:17 +0800)]
Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle

7 years agoMDL-47919 tool_monitor: refer to fields by labels in behat
Marina Glancy [Thu, 30 Oct 2014 06:03:10 +0000 (14:03 +0800)]
MDL-47919 tool_monitor: refer to fields by labels in behat

7 years agoMDL-47746 gradebook: Visual bug fix for Scales in Singleview.
Zachary Durber [Mon, 27 Oct 2014 00:39:03 +0000 (08:39 +0800)]
MDL-47746 gradebook: Visual bug fix for Scales in Singleview.

7 years agoMDL-47909 mod_forum: Respect user autosubscribe setting on post
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.

7 years agoMDL-47310 gradebook: accessibility improvements
Jetha Chan [Thu, 30 Oct 2014 05:28:15 +0000 (13:28 +0800)]
MDL-47310 gradebook: accessibility improvements

7 years agoMDL-47896 gradebook: Fix for non-overridden grades.
Zachary Durber [Thu, 30 Oct 2014 05:26:44 +0000 (13:26 +0800)]
MDL-47896 gradebook: Fix for non-overridden grades.

7 years agoMDL-25057 mod_forum: Stop duplicating forum_read posts from cron
Andrew Nicols [Wed, 29 Oct 2014 01:28:55 +0000 (09:28 +0800)]
MDL-25057 mod_forum: Stop duplicating forum_read posts from cron

This also includes an upgrade script to delete the existing duplicates.

7 years agoMDL-47960 behat: Fixed message node navigation
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.

7 years agoMDL-47960 messages: behat failures caused by user menu
Dan Poltawski [Wed, 29 Oct 2014 15:58:22 +0000 (15:58 +0000)]
MDL-47960 messages: behat failures caused by user menu

7 years agoMDL-47960 badges: behat failures caused by usermenu
Dan Poltawski [Wed, 29 Oct 2014 15:57:17 +0000 (15:57 +0000)]
MDL-47960 badges: behat failures caused by usermenu

7 years agoMDL-47960 behat: fix my private files navigation
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..

7 years agoMDL-47970 mod_scorm: fixed HTML5 validation error
Sam Hemelryk [Thu, 30 Oct 2014 01:23:59 +0000 (14:23 +1300)]
MDL-47970 mod_scorm: fixed HTML5 validation error

7 years agoMDL-47349 gradereport: Use category title on report
Andrew Nicols [Wed, 15 Oct 2014 01:33:52 +0000 (09:33 +0800)]
MDL-47349 gradereport: Use category title on report

7 years agoMDL-47966 Add default content type and encoding
Petr Skoda [Wed, 29 Oct 2014 22:16:26 +0000 (11:16 +1300)]
MDL-47966 Add default content type and encoding

7 years agoMDL-47959 Number of questions not updated dynamically in new quiz edit page
Colin Chambers [Wed, 29 Oct 2014 15:51:30 +0000 (15:51 +0000)]
MDL-47959 Number of questions not updated dynamically in new quiz edit page

7 years agoMerge branch 'wip_MDL-40949_m28_pathsettings' of https://github.com/skodak/moodle
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

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-42875 users: Show only profile visible roles on participants list
pau.ferrer-ocana [Wed, 29 Oct 2014 09:32:57 +0000 (10:32 +0100)]
MDL-42875 users: Show only profile visible roles on participants list

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 agoMDL-45538 files: restore missing records in draft areas
Marina Glancy [Thu, 16 Oct 2014 09:10:51 +0000 (17:10 +0800)]
MDL-45538 files: restore missing records in draft areas

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-40949 admin: Fix $CFG->preventexecpath hints
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.

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