moodle.git
8 years agoMoodle release 2.8rc1 v2.8.0-rc1
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 10:45:59 +0000 (11:45 +0100)]
Moodle release 2.8rc1

8 years agoMDL-47361 tool_monitor: added missing column
Mark Nelson [Tue, 4 Nov 2014 07:48:26 +0000 (23:48 -0800)]
MDL-47361 tool_monitor: added missing column

Also reworded a string as the fields have been renamed.

8 years agoMerge branch 'MDL-47806' of github.com:mr-russ/moodle
Damyon Wiese [Tue, 4 Nov 2014 06:34:43 +0000 (14:34 +0800)]
Merge branch 'MDL-47806' of github.com:mr-russ/moodle

8 years agoMerge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao...
Damyon Wiese [Tue, 4 Nov 2014 06:17:46 +0000 (14:17 +0800)]
Merge branch 'MDL-47810_master-fix-MDL-47758-changes' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle
Damyon Wiese [Tue, 4 Nov 2014 05:47:51 +0000 (13:47 +0800)]
Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle

8 years agoMDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758
David Monllao [Tue, 4 Nov 2014 03:53:19 +0000 (11:53 +0800)]
MDL-47810 tool_monitor: Updating behat scenarios introduced in MDL-47758

8 years agoMerge branch 'MDL-48006-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 4 Nov 2014 02:47:09 +0000 (10:47 +0800)]
Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-47883-master-foundlangfile' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 01:03:11 +0000 (02:03 +0100)]
Merge branch 'MDL-47883-master-foundlangfile' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:59:23 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-47976-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch '47969-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:56:59 +0000 (01:56 +0100)]
Merge branch '47969-28' of git://github.com/samhemelryk/moodle

8 years agoMerge branch '47968-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:55:08 +0000 (01:55 +0100)]
Merge branch '47968-28' of git://github.com/samhemelryk/moodle

8 years agoMDL-47868 ws: verify upload areas
Petr Skoda [Mon, 3 Nov 2014 19:52:26 +0000 (08:52 +1300)]
MDL-47868 ws: verify upload areas

8 years agoMDL-48013 calendar: force download of user files
Petr Skoda [Mon, 3 Nov 2014 19:41:34 +0000 (08:41 +1300)]
MDL-48013 calendar: force download of user files

8 years agoMerge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 00:20:51 +0000 (01:20 +0100)]
Merge branch 'MDL-47207_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch '47917-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 3 Nov 2014 23:03:42 +0000 (00:03 +0100)]
Merge branch '47917-28' of git://github.com/samhemelryk/moodle

8 years agoMDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors
Damyon Wiese [Mon, 3 Nov 2014 22:46:57 +0000 (11:46 +1300)]
MDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors

8 years agoMDL-47965 tag: Enforcing security of tag auto completion
Frederic Massart [Thu, 30 Oct 2014 06:34:24 +0000 (14:34 +0800)]
MDL-47965 tag: Enforcing security of tag auto completion

8 years agoMDL-47924 mod_lti: Fixing missing sesskey checkings
David Monllao [Wed, 29 Oct 2014 06:00:31 +0000 (14:00 +0800)]
MDL-47924 mod_lti: Fixing missing sesskey checkings

Also fixing a missing capability checking.

8 years agoMDL-47190 Ensure badges cannot be awarded without a role
Yuliya Bozhko [Mon, 27 Oct 2014 18:47:05 +0000 (07:47 +1300)]
MDL-47190 Ensure badges cannot be awarded without a role

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
8 years agoMDL-47321 iplookup: Prevent guest users from using iplookup
Frederic Massart [Tue, 28 Oct 2014 04:04:08 +0000 (12:04 +0800)]
MDL-47321 iplookup: Prevent guest users from using iplookup

8 years agoMDL-47697 mod_data: Fix group id change when editing.
Adrian Greeve [Tue, 28 Oct 2014 02:11:55 +0000 (10:11 +0800)]
MDL-47697 mod_data: Fix group id change when editing.

When a teacher edits an entry in the database module
it would change the group ID to the one that the teacher
currently had selected.

Thanks to Steve Bond for providing a patch.

8 years agoMDL-45303 Web Services: forum_discussions not checking groups
Juan Leyva [Wed, 23 Jul 2014 21:42:25 +0000 (23:42 +0200)]
MDL-45303 Web Services: forum_discussions not checking groups

8 years agoMDL-47766 web services: get_grades exposes hidden grades to students
Juan Leyva [Thu, 23 Oct 2014 09:05:57 +0000 (11:05 +0200)]
MDL-47766 web services: get_grades exposes hidden grades to students

8 years agoMDL-47921 mod_lti: Add access control to mod/lti/launch.php
John Okely [Wed, 29 Oct 2014 02:50:25 +0000 (10:50 +0800)]
MDL-47921 mod_lti: Add access control to mod/lti/launch.php

8 years agoMDL-47050 core_wordlist: Updated wordlist to include only animals.
Dave Cooper [Tue, 28 Oct 2014 08:40:58 +0000 (16:40 +0800)]
MDL-47050 core_wordlist: Updated wordlist to include only animals.

8 years agoMerge branch 'MDL-47864_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 15:20:58 +0000 (15:20 +0000)]
Merge branch 'MDL-47864_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 15:03:51 +0000 (15:03 +0000)]
Merge branch 'MDL-47810_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)]
Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle

8 years agoMDL-47361 tool_monitor: exit after printing footer
Dan Poltawski [Mon, 3 Nov 2014 14:21:50 +0000 (14:21 +0000)]
MDL-47361 tool_monitor: exit after printing footer

8 years agoMerge branch 'MDL-47361_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 3 Nov 2014 13:55:31 +0000 (13:55 +0000)]
Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle

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

8 years agoMerge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 3 Nov 2014 12:28:33 +0000 (12:28 +0000)]
Merge branch 'MDL-47903-master' of git://github.com/andrewnicols/moodle

Conflicts:
mod/forum/version.php
    mod/forum/db/upgrade.php

8 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

8 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

8 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

8 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

8 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

8 years agoMDL-47810 tool_monitor: action_link when there is only 1 option
David Monllao [Mon, 3 Nov 2014 01:32:02 +0000 (09:32 +0800)]
MDL-47810 tool_monitor: action_link when there is only 1 option

When the rule plugin is not a module you can subscribe
to it without having to select to which module instance
you want to subscribe, so there is no need to display
a drop down menu.

8 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

8 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

8 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

8 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

8 years agoMDL-47983 tool_monitor: Removing only-for-admins restriction
David Monllao [Mon, 3 Nov 2014 03:01:50 +0000 (11:01 +0800)]
MDL-47983 tool_monitor: Removing only-for-admins restriction

8 years agoMDL-47361 tool_monitor: altered behat tests so they pass
Mark Nelson [Fri, 31 Oct 2014 01:05:44 +0000 (18:05 -0700)]
MDL-47361 tool_monitor: altered behat tests so they pass

8 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

8 years agoMDL-48006 Atto autosave: Never restore text that is empty.
Damyon Wiese [Mon, 3 Nov 2014 03:29:42 +0000 (11:29 +0800)]
MDL-48006 Atto autosave: Never restore text that is empty.

8 years agoMDL-47361 tooL_monitor: string and UI changes
Mark Nelson [Thu, 2 Oct 2014 23:44:39 +0000 (16:44 -0700)]
MDL-47361 tooL_monitor: string and UI changes

8 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

8 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.

8 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

8 years agoMDL-47917 cachestore_memcached: fixed get_many ordering
Sam Hemelryk [Mon, 3 Nov 2014 01:08:25 +0000 (14:08 +1300)]
MDL-47917 cachestore_memcached: fixed get_many ordering

8 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

8 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

8 years agoMDL-47969 mod_survey: fixed HTML5 validation of index.php
Sam Hemelryk [Thu, 30 Oct 2014 01:08:14 +0000 (14:08 +1300)]
MDL-47969 mod_survey: fixed HTML5 validation of index.php

8 years agoMDL-47968 mod_forum: fixed search form HTML5 validation
Sam Hemelryk [Thu, 30 Oct 2014 01:04:01 +0000 (14:04 +1300)]
MDL-47968 mod_forum: fixed search form HTML5 validation

8 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.

8 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

8 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

8 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

8 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.

8 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

8 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.

8 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.

8 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

8 years agoMDL-47883 admin: Fix missing string in the plugin validation
David Mudrák [Fri, 31 Oct 2014 08:58:43 +0000 (09:58 +0100)]
MDL-47883 admin: Fix missing string in the plugin validation

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

8 years agoMDL-47758 tool_monitor: altered behat tests so they pass
Mark Nelson [Fri, 31 Oct 2014 04:13:51 +0000 (21:13 -0700)]
MDL-47758 tool_monitor: altered behat tests so they pass

8 years agoMDL-47758 tool_monitor: prevent DB error when revisiting a delete URL
Mark Nelson [Mon, 27 Oct 2014 05:52:08 +0000 (22:52 -0700)]
MDL-47758 tool_monitor: prevent DB error when revisiting a delete URL

8 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

8 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

8 years agoMDL-47976 tool_monitor: fix ordering in unittest
Marina Glancy [Thu, 30 Oct 2014 07:55:12 +0000 (15:55 +0800)]
MDL-47976 tool_monitor: fix ordering in unittest

8 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

8 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

8 years agoMDL-47864 tool_monitor: Change edulevels
David Monllao [Fri, 31 Oct 2014 05:22:43 +0000 (13:22 +0800)]
MDL-47864 tool_monitor: Change edulevels

Considering that the most common use case
to manage rules is an admin CRUDing them.

8 years agoMDL-47864 grade_report: Edulevels according to default user permissions
David Monllao [Thu, 30 Oct 2014 07:56:34 +0000 (15:56 +0800)]
MDL-47864 grade_report: Edulevels according to default user permissions

8 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

8 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.

8 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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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.