moodle.git
6 years agoMerge branch 'MDL-46986-master' of git://github.com/lameze/moodle
Marina Glancy [Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)]
Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle

6 years agoMDL-48091 users: Revert "MDL-42875 users: Show only profile visible..."
Damyon Wiese [Fri, 7 Nov 2014 01:30:42 +0000 (09:30 +0800)]
MDL-48091 users: Revert "MDL-42875 users: Show only profile visible..."

This reverts commit a09a837f20e2e09a19c8120bf71bac794ee68ae6.

6 years agoMDL-46986 mod_assign: Remove duplicate column identifier
Simey Lameze [Fri, 7 Nov 2014 01:19:18 +0000 (09:19 +0800)]
MDL-46986 mod_assign: Remove duplicate column identifier

6 years agoMerge branch 'MDL-47943-master' of https://github.com/dthies/moodle
Eloy Lafuente (stronk7) [Thu, 6 Nov 2014 17:44:38 +0000 (18:44 +0100)]
Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle

6 years agoMerge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 6 Nov 2014 16:40:50 +0000 (17:40 +0100)]
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle

6 years agoMDL-48035 Fix more Behat tests regressions after merging en_fix strings
David Mudrák [Thu, 6 Nov 2014 15:12:29 +0000 (16:12 +0100)]
MDL-48035 Fix more Behat tests regressions after merging en_fix strings

6 years agoMDL-48090 mod_forum: Optimise subquery out of discussion subs list
Andrew Nicols [Thu, 6 Nov 2014 09:40:25 +0000 (17:40 +0800)]
MDL-48090 mod_forum: Optimise subquery out of discussion subs list

6 years agoMerge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 6 Nov 2014 10:14:52 +0000 (11:14 +0100)]
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle

6 years agoMDL-48035 Fix Behat tests regressions after merging en_fix strings
David Mudrák [Thu, 6 Nov 2014 09:38:51 +0000 (10:38 +0100)]
MDL-48035 Fix Behat tests regressions after merging en_fix strings

6 years agoMerge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 6 Nov 2014 09:14:48 +0000 (09:14 +0000)]
Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle
Dan Poltawski [Thu, 6 Nov 2014 08:58:27 +0000 (08:58 +0000)]
Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle

6 years agoMerge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 6 Nov 2014 08:53:55 +0000 (08:53 +0000)]
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle

6 years agoMDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub
Andrew Nicols [Thu, 6 Nov 2014 08:50:36 +0000 (16:50 +0800)]
MDL-47390 mod_forum: Provide ID and Discussion ID for discussion unsub

6 years agoMDL-47980 gradebook: fixed label for bulk insert select box
Jetha Chan [Thu, 6 Nov 2014 08:37:23 +0000 (16:37 +0800)]
MDL-47980 gradebook: fixed label for bulk insert select box

6 years agoMerge branch 'MDL-47980-master' of git://github.com/jethac/moodle
Marina Glancy [Thu, 6 Nov 2014 07:14:05 +0000 (15:14 +0800)]
Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle

6 years agoMDL-43430 ldap: whitespace fix
Damyon Wiese [Thu, 6 Nov 2014 04:05:32 +0000 (12:05 +0800)]
MDL-43430 ldap: whitespace fix

6 years agoMerge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle
Damyon Wiese [Thu, 6 Nov 2014 04:00:12 +0000 (12:00 +0800)]
Merge branch 'wip_master_mdl-43430' of https://github.com/iarenaza/moodle

6 years agoMerge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle
Marina Glancy [Thu, 6 Nov 2014 03:42:10 +0000 (11:42 +0800)]
Merge branch 'wip_MDL-48083_m28_rollback' of git://github.com/skodak/moodle

6 years agoMerge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 6 Nov 2014 03:30:42 +0000 (11:30 +0800)]
Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle

6 years agoMDL-48061 mod_forum: posttext should concat
Andrew Nicols [Thu, 6 Nov 2014 03:29:25 +0000 (11:29 +0800)]
MDL-48061 mod_forum: posttext should concat

6 years agoMerge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 6 Nov 2014 03:22:42 +0000 (11:22 +0800)]
Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle

6 years agoMDL-48061 mod_forum: Correct variable name in HTML warning message
Andrew Nicols [Thu, 6 Nov 2014 03:04:48 +0000 (11:04 +0800)]
MDL-48061 mod_forum: Correct variable name in HTML warning message

6 years agoMDL-48083 dml: Empty buffers on forced rollback
Petr Skoda [Thu, 6 Nov 2014 01:37:48 +0000 (14:37 +1300)]
MDL-48083 dml: Empty buffers on forced rollback

6 years agoMDL-48029 mod_forum: Check for subscription before enrolling
Andrew Nicols [Mon, 3 Nov 2014 02:42:13 +0000 (10:42 +0800)]
MDL-48029 mod_forum: Check for subscription before enrolling

6 years agoMDL-47980 gradebook: add labels and legends missing from single view
Jetha Chan [Wed, 5 Nov 2014 05:43:02 +0000 (13:43 +0800)]
MDL-47980 gradebook: add labels and legends missing from single view

6 years agoMDL-47922 tool_monitor: Update strings
Ankit Agarwal [Thu, 6 Nov 2014 02:12:24 +0000 (07:42 +0530)]
MDL-47922 tool_monitor: Update strings

6 years agoMerge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 6 Nov 2014 01:15:44 +0000 (02:15 +0100)]
Merge branch 'wip-MDL-47174-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-47174 events: new calendar event may have 0 timestart
Marina Glancy [Wed, 5 Nov 2014 08:51:55 +0000 (16:51 +0800)]
MDL-47174 events: new calendar event may have 0 timestart

6 years agoMerge branch 'wip-mdl-45416' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:57:45 +0000 (00:57 +0100)]
Merge branch 'wip-mdl-45416' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch '48026-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)]
Merge branch '48026-28' of git://github.com/samhemelryk/moodle

6 years agoMDL-47862 tool_monitor: Fix tool monitor navigation tree
John Okely [Fri, 31 Oct 2014 02:29:24 +0000 (10:29 +0800)]
MDL-47862 tool_monitor: Fix tool monitor navigation tree

Added event monitor rules link to the frontpage navigation tree, when
editing the frontpage rules. Added hack so that when viewing the site
context subscriptions, the link in navigation is correct, allowing the
breadcrumbs to appear

6 years agoMDL-47862 event_monitor: Fix context for capability check on subscription page
John Okely [Mon, 27 Oct 2014 07:36:36 +0000 (15:36 +0800)]
MDL-47862 event_monitor: Fix context for capability check on subscription page

6 years agoMerge branch 'MDL-47990' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:22:32 +0000 (00:22 +0100)]
Merge branch 'MDL-47990' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-48050-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:01:01 +0000 (00:01 +0100)]
Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 5 Nov 2014 22:55:46 +0000 (11:55 +1300)]
Merge branch 'MDL-48044-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 20:34:37 +0000 (21:34 +0100)]
Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle
Dan Poltawski [Wed, 5 Nov 2014 16:24:14 +0000 (16:24 +0000)]
Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle

6 years agoMDL-47943 editor_atto: Save selection on mouseleave for Chrome
Daniel Thies [Wed, 5 Nov 2014 15:34:20 +0000 (09:34 -0600)]
MDL-47943 editor_atto: Save selection on mouseleave for Chrome

6 years agoMerge branch 'MDL-47874' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 5 Nov 2014 14:27:12 +0000 (14:27 +0000)]
Merge branch 'MDL-47874' of git://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-48021' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:11:16 +0000 (12:11 +0000)]
Merge branch 'MDL-48021' of git://github.com/stronk7/moodle

Conflicts:
admin/tool/monitor/version.php
mod/lesson/version.php

6 years agoMerge branch 'MDL-48047-master' of git://github.com/lameze/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:05:58 +0000 (12:05 +0000)]
Merge branch 'MDL-48047-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:03:48 +0000 (12:03 +0000)]
Merge branch 'MDL-48068-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47981-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Nov 2014 12:00:19 +0000 (12:00 +0000)]
Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle

6 years agoMDL-47922 tool_monitor: bump version
Dan Poltawski [Wed, 5 Nov 2014 11:42:37 +0000 (11:42 +0000)]
MDL-47922 tool_monitor: bump version

6 years agoMerge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 5 Nov 2014 11:18:22 +0000 (11:18 +0000)]
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-47982-master' of git://github.com/gurgus/moodle
Dan Poltawski [Wed, 5 Nov 2014 11:03:57 +0000 (11:03 +0000)]
Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle

6 years agoMDL-48019 mod_forum: Add sesskey checks when setting tracking prefs
Andrew Nicols [Mon, 3 Nov 2014 01:49:00 +0000 (09:49 +0800)]
MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs

This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.

6 years agoMerge branch 'MDL-48067-master' of git://github.com/jethac/moodle
Dan Poltawski [Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)]
Merge branch 'MDL-48067-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 5 Nov 2014 08:54:32 +0000 (16:54 +0800)]
Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle
Damyon Wiese [Wed, 5 Nov 2014 08:52:07 +0000 (16:52 +0800)]
Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 5 Nov 2014 08:35:05 +0000 (16:35 +0800)]
Merge branch 'MDL-47390-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis
Iñaki Arenaza [Sun, 26 Oct 2014 23:30:46 +0000 (00:30 +0100)]
MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis

While testing the fix, it was found that ldap_stripslashes() was broken and
using a deprecated PCRE patter modifier, so it's also been fixed.

Thanks to Damyon Wiese, some units tests have been added to cover
ldap_addslashes() and ldap_stripslashes().

6 years agoMDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis
Iñaki Arenaza [Sun, 26 Oct 2014 23:15:47 +0000 (00:15 +0100)]
MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis

The group names we get from ldap_find_user_groups() can contain invalid LDAP
filter characters. So we need to escape them for LDAP filter usage.

6 years agoMDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis
Iñaki Arenaza [Sat, 13 Sep 2014 00:37:26 +0000 (02:37 +0200)]
MDL-43430 enrol_ldap: Enrolment lost if member of group with parenthesis

As part of fixing MDL-43430, a typo has been detected in the
quoted alphanumeric characters (the '=' and '>' were transposed).

6 years agoMerge branch '48025-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Wed, 5 Nov 2014 07:39:27 +0000 (15:39 +0800)]
Merge branch '48025-28' of git://github.com/samhemelryk/moodle

6 years agoMDL-48047 gradebook: change the missing ID number to checkbox on XML export
Simey Lameze [Wed, 5 Nov 2014 06:00:06 +0000 (14:00 +0800)]
MDL-48047 gradebook: change the missing ID number to checkbox on XML export

6 years agoMerge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle
Damyon Wiese [Wed, 5 Nov 2014 07:22:55 +0000 (15:22 +0800)]
Merge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle

6 years agoMerge branch 'MDL-47360-master' of git://github.com/lameze/moodle
Damyon Wiese [Wed, 5 Nov 2014 07:12:56 +0000 (15:12 +0800)]
Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle

6 years agoMDL-48068 tool_monitor: Link to course points to the right course
Frederic Massart [Wed, 5 Nov 2014 07:06:27 +0000 (15:06 +0800)]
MDL-48068 tool_monitor: Link to course points to the right course

6 years agoMDL-47360 tool_monitor: add more help link and default template message
Simey Lameze [Wed, 5 Nov 2014 06:57:53 +0000 (14:57 +0800)]
MDL-47360 tool_monitor: add more help link and default template message

6 years agoMDL-48054 mod_forum: Fix unit test failures
Andrew Nicols [Wed, 5 Nov 2014 01:09:02 +0000 (09:09 +0800)]
MDL-48054 mod_forum: Fix unit test failures

These sporadic unit test failures were happening because the post time and
subscription time sometimes differ depending on the amount of time it takes
to complete the different components of the test.

To reliably address these issues, the post creation, and the discussion
subscription times are manually updated by different factors to ensure a
more realistic state of affairs.

6 years agoMDL-47893 gradebook: Fix for bulk updating single view.
Zachary Durber [Wed, 5 Nov 2014 06:11:55 +0000 (14:11 +0800)]
MDL-47893 gradebook: Fix for bulk updating single view.

6 years agoMerge branch 'wip-MDL-46262-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 5 Nov 2014 06:38:11 +0000 (14:38 +0800)]
Merge branch 'wip-MDL-46262-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-48067 user_menu: allow empty customusermenuitems setting
Jetha Chan [Wed, 5 Nov 2014 06:37:33 +0000 (14:37 +0800)]
MDL-48067 user_menu: allow empty customusermenuitems setting

6 years agoMDL-47793 assign: trivial fix for inconsistent use of get_instance()
Damyon Wiese [Wed, 5 Nov 2014 06:27:58 +0000 (14:27 +0800)]
MDL-47793 assign: trivial fix for inconsistent use of get_instance()

6 years agoMerge branch 'MDL-47793-m' of https://github.com/micaherne/moodle
Damyon Wiese [Wed, 5 Nov 2014 06:25:22 +0000 (14:25 +0800)]
Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle

6 years agoMerge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)]
Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com...
Damyon Wiese [Wed, 5 Nov 2014 06:05:32 +0000 (14:05 +0800)]
Merge branch 'MDL-47902_scorm_inappropriate_default_values' of https://github.com/MorrisR2/moodle

6 years agoMDL-27930 lesson: Remove custom styling from timer
Damyon Wiese [Wed, 5 Nov 2014 05:57:08 +0000 (13:57 +0800)]
MDL-27930 lesson: Remove custom styling from timer

6 years agoMerge branch 'MDL-27930' of git://github.com/jmvedrine/moodle
Damyon Wiese [Wed, 5 Nov 2014 05:34:07 +0000 (13:34 +0800)]
Merge branch 'MDL-27930' of git://github.com/jmvedrine/moodle

6 years agoMDL-48031 gradebook: Fix for bulk updating users in single view.
Zachary Durber [Mon, 3 Nov 2014 06:13:02 +0000 (14:13 +0800)]
MDL-48031 gradebook: Fix for bulk updating users in single view.

6 years agoMDL-47922 behat: Add a behat test
Ankit Agarwal [Mon, 3 Nov 2014 06:06:06 +0000 (11:36 +0530)]
MDL-47922 behat: Add a behat test

6 years agoMDL-47922 tests: Enable tool monitor in various tests
Ankit Agarwal [Thu, 30 Oct 2014 06:59:07 +0000 (12:29 +0530)]
MDL-47922 tests: Enable tool monitor in various tests

6 years agoMDL-47922 tool_monitor: Add a config to disable the tool
Ankit Agarwal [Mon, 3 Nov 2014 06:06:25 +0000 (11:36 +0530)]
MDL-47922 tool_monitor: Add a config to disable the tool

6 years agoMDL-48061 mod_forum: Tidy up reply-by-email information in emails
Andrew Nicols [Wed, 5 Nov 2014 00:45:46 +0000 (08:45 +0800)]
MDL-48061 mod_forum: Tidy up reply-by-email information in emails

* Add a reminder to remove the original message; and
* Remove the reply-to address from the text.

6 years agoMDL-45416 enrol_ldap: Use null_progress_trace while running phpunit
Rajesh Taneja [Tue, 4 Nov 2014 09:23:25 +0000 (17:23 +0800)]
MDL-45416 enrol_ldap: Use null_progress_trace while running phpunit

6 years agoMerge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 00:16:05 +0000 (01:16 +0100)]
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle

6 years agoMDL-48035 Merge English strings from the en_fix language pack
Helen Foster [Tue, 4 Nov 2014 20:55:26 +0000 (21:55 +0100)]
MDL-48035 Merge English strings from the en_fix language pack

6 years agoMDL-48021 bump: Bump all versions to planned release
Eloy Lafuente (stronk7) [Tue, 4 Nov 2014 16:52:35 +0000 (17:52 +0100)]
MDL-48021 bump: Bump all versions to planned release

This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)

6 years agoMerge branch 'MDL-47893-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 4 Nov 2014 16:50:47 +0000 (16:50 +0000)]
Merge branch 'MDL-47893-master' of git://github.com/zbdd/moodle

6 years agoMerge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)]
Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-27930 Lesson: the count-down timer does not work
Jean-Michel Vedrine [Sat, 25 Oct 2014 18:35:02 +0000 (20:35 +0200)]
MDL-27930 Lesson: the count-down timer does not work

6 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

6 years agoMDL-48050 Libraries - fake HTTPS detection needs the correct port
Damyon Wiese [Tue, 4 Nov 2014 08:50:25 +0000 (16:50 +0800)]
MDL-48050 Libraries - fake HTTPS detection needs the correct port

6 years agoMDL-47390 mod_forum: Correct check for groups when subscribing
Andrew Nicols [Fri, 31 Oct 2014 00:54:02 +0000 (08:54 +0800)]
MDL-47390 mod_forum: Correct check for groups when subscribing

6 years agoMDL-47390 mod_forum: Add discussion unsub to email footer
Andrew Nicols [Tue, 28 Oct 2014 06:25:51 +0000 (14:25 +0800)]
MDL-47390 mod_forum: Add discussion unsub to email footer

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

6 years agoMDL-48044 mod_forum: Preload icons for discussion subscription toggles
Andrew Nicols [Tue, 4 Nov 2014 07:45:38 +0000 (15:45 +0800)]
MDL-48044 mod_forum: Preload icons for discussion subscription toggles

6 years agoMDL-47944 mod_forum: Improve discussion subscription icon/link
Andrew Nicols [Tue, 4 Nov 2014 06:57:15 +0000 (14:57 +0800)]
MDL-47944 mod_forum: Improve discussion subscription icon/link

* make the link text clickable
* changes the link text when unsubscribed to the action text "Subscribe"

6 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

6 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

6 years agoMDL-47893 gradebook: Progress bar and continues for grade saving.
Zachary Durber [Fri, 31 Oct 2014 07:39:34 +0000 (15:39 +0800)]
MDL-47893 gradebook: Progress bar and continues for grade saving.

When you save a grade you are notified of how many grades have
been updated and any warnings.

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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