Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 22:30:59 +0000 (23:30 +0100)]
Moodle release 2.8
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 22:30:53 +0000 (23:30 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
AMOS bot [Sat, 8 Nov 2014 16:05:33 +0000 (00:05 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 10:19:59 +0000 (11:19 +0100)]
Merge branch 'MDL-48107_master' of https://github.com/markn86/moodle
Mark Nelson [Sat, 8 Nov 2014 07:50:20 +0000 (23:50 -0800)]
MDL-48107 tool_monitor: extended automated tests
Also adjusted them so they will pass with these changes.
Mark Nelson [Sat, 8 Nov 2014 06:50:53 +0000 (22:50 -0800)]
MDL-48107 tool_monitor: prevent site rule removal when deleting a course
Mark Nelson [Sat, 8 Nov 2014 05:39:55 +0000 (21:39 -0800)]
MDL-48107 tool_monitor: added total subs to the delete rule string
Also made some minor language string changes.
Eloy Lafuente (stronk7) [Fri, 7 Nov 2014 15:59:39 +0000 (16:59 +0100)]
Moodle release 2.8rc2
Damyon Wiese [Fri, 7 Nov 2014 09:37:10 +0000 (17:37 +0800)]
MDL-47900 Event monitor: Fix name of cache lang string for event monitor
AMOS BEGIN
MOV [cachedef_rules, tool_monitor],[cachedef_eventsubscriptions, tool_monitor]
AMOS END
Damyon Wiese [Fri, 7 Nov 2014 08:58:52 +0000 (16:58 +0800)]
Merge branch 'MDL-47900_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Fri, 7 Nov 2014 08:37:32 +0000 (09:37 +0100)]
Merge branch 'wip-mdl-48035' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Fri, 7 Nov 2014 08:08:20 +0000 (16:08 +0800)]
Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle
Simey Lameze [Fri, 7 Nov 2014 07:54:14 +0000 (15:54 +0800)]
MDL-46986 mod_assign: Change the asserting to false
John Okely [Fri, 31 Oct 2014 05:36:52 +0000 (13:36 +0800)]
MDL-47949 mod_wiki: Validate parameters for page deletion
Marina Glancy [Fri, 7 Nov 2014 07:03:32 +0000 (15:03 +0800)]
Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle
Rajesh Taneja [Fri, 7 Nov 2014 05:43:19 +0000 (13:43 +0800)]
MDL-48035 mod_forum: Reverted string change in step to keep correct functionality
Marina Glancy [Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)]
Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle
Mark Nelson [Tue, 28 Oct 2014 22:27:12 +0000 (15:27 -0700)]
MDL-47900 tool_monitor: expanded unit tests
Expanded the unit tests to ensure unnecessary events are not
saved in the DB and altered existing tests so they pass with
the introduction of this feature.
Mark Nelson [Tue, 28 Oct 2014 21:28:35 +0000 (14:28 -0700)]
MDL-47900 tool_monitor: created list of rules MUC
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.
Simey Lameze [Fri, 7 Nov 2014 01:19:18 +0000 (09:19 +0800)]
MDL-46986 mod_assign: Remove duplicate column identifier
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
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
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
Andrew Nicols [Thu, 6 Nov 2014 09:40:25 +0000 (17:40 +0800)]
MDL-48090 mod_forum: Optimise subquery out of discussion subs list
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
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
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
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
Dan Poltawski [Thu, 6 Nov 2014 08:53:55 +0000 (08:53 +0000)]
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
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
Jetha Chan [Thu, 6 Nov 2014 08:37:23 +0000 (16:37 +0800)]
MDL-47980 gradebook: fixed label for bulk insert select box
Marina Glancy [Thu, 6 Nov 2014 07:14:05 +0000 (15:14 +0800)]
Merge branch 'MDL-47980-master' of git://github.com/jethac/moodle
Simey Lameze [Wed, 5 Nov 2014 05:34:40 +0000 (13:34 +0800)]
MDL-47869 tool_monitor: Add sorting on event monitor pages
Damyon Wiese [Thu, 6 Nov 2014 04:05:32 +0000 (12:05 +0800)]
MDL-43430 ldap: whitespace fix
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
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
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
Andrew Nicols [Thu, 6 Nov 2014 03:29:25 +0000 (11:29 +0800)]
MDL-48061 mod_forum: posttext should concat
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
Andrew Nicols [Thu, 6 Nov 2014 03:04:48 +0000 (11:04 +0800)]
MDL-48061 mod_forum: Correct variable name in HTML warning message
Petr Skoda [Thu, 6 Nov 2014 01:37:48 +0000 (14:37 +1300)]
MDL-48083 dml: Empty buffers on forced rollback
Andrew Nicols [Mon, 3 Nov 2014 02:42:13 +0000 (10:42 +0800)]
MDL-48029 mod_forum: Check for subscription before enrolling
Jetha Chan [Wed, 5 Nov 2014 05:43:02 +0000 (13:43 +0800)]
MDL-47980 gradebook: add labels and legends missing from single view
Ankit Agarwal [Thu, 6 Nov 2014 02:12:24 +0000 (07:42 +0530)]
MDL-47922 tool_monitor: Update strings
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
Marina Glancy [Wed, 5 Nov 2014 08:51:55 +0000 (16:51 +0800)]
MDL-47174 events: new calendar event may have 0 timestart
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
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)]
Merge branch '48026-28' of git://github.com/samhemelryk/moodle
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
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
Eloy Lafuente (stronk7) [Wed, 5 Nov 2014 23:22:32 +0000 (00:22 +0100)]
Merge branch 'MDL-47990' of git://github.com/timhunt/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
Sam Hemelryk [Wed, 5 Nov 2014 22:55:46 +0000 (11:55 +1300)]
Merge branch 'MDL-48044-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
Dan Poltawski [Wed, 5 Nov 2014 16:24:14 +0000 (16:24 +0000)]
Merge branch 'MDL-47466-master' of https://github.com/tehanuyor/moodle
Daniel Thies [Wed, 5 Nov 2014 15:34:20 +0000 (09:34 -0600)]
MDL-47943 editor_atto: Save selection on mouseleave for Chrome
Dan Poltawski [Wed, 5 Nov 2014 14:27:12 +0000 (14:27 +0000)]
Merge branch 'MDL-47874' 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
Dan Poltawski [Wed, 5 Nov 2014 12:05:58 +0000 (12:05 +0000)]
Merge branch 'MDL-48047-master' of git://github.com/lameze/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
Dan Poltawski [Wed, 5 Nov 2014 12:00:19 +0000 (12:00 +0000)]
Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 5 Nov 2014 11:42:37 +0000 (11:42 +0000)]
MDL-47922 tool_monitor: bump version
Dan Poltawski [Wed, 5 Nov 2014 11:18:22 +0000 (11:18 +0000)]
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/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
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.
Dan Poltawski [Wed, 5 Nov 2014 10:15:41 +0000 (10:15 +0000)]
Merge branch 'MDL-48067-master' of git://github.com/jethac/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
Damyon Wiese [Wed, 5 Nov 2014 08:52:07 +0000 (16:52 +0800)]
Merge branch 'MDL-46500_master' of https://github.com/dmonllao/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
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().
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.
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).
Damyon Wiese [Wed, 5 Nov 2014 07:39:27 +0000 (15:39 +0800)]
Merge branch '48025-28' of git://github.com/samhemelryk/moodle
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
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
Damyon Wiese [Wed, 5 Nov 2014 07:12:56 +0000 (15:12 +0800)]
Merge branch 'MDL-47360-master' of git://github.com/lameze/moodle
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
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
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.
Zachary Durber [Wed, 5 Nov 2014 06:11:55 +0000 (14:11 +0800)]
MDL-47893 gradebook: Fix for bulk updating single view.
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
Jetha Chan [Wed, 5 Nov 2014 06:37:33 +0000 (14:37 +0800)]
MDL-48067 user_menu: allow empty customusermenuitems setting
Damyon Wiese [Wed, 5 Nov 2014 06:27:58 +0000 (14:27 +0800)]
MDL-47793 assign: trivial fix for inconsistent use of get_instance()
Damyon Wiese [Wed, 5 Nov 2014 06:25:22 +0000 (14:25 +0800)]
Merge branch 'MDL-47793-m' of https://github.com/micaherne/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
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
Damyon Wiese [Wed, 5 Nov 2014 05:57:08 +0000 (13:57 +0800)]
MDL-27930 lesson: Remove custom styling from timer
Damyon Wiese [Wed, 5 Nov 2014 05:34:07 +0000 (13:34 +0800)]
Merge branch 'MDL-27930' of git://github.com/jmvedrine/moodle
Zachary Durber [Mon, 3 Nov 2014 06:13:02 +0000 (14:13 +0800)]
MDL-48031 gradebook: Fix for bulk updating users in single view.
Ankit Agarwal [Mon, 3 Nov 2014 06:06:06 +0000 (11:36 +0530)]
MDL-47922 behat: Add a behat test
Ankit Agarwal [Thu, 30 Oct 2014 06:59:07 +0000 (12:29 +0530)]
MDL-47922 tests: Enable tool monitor in various tests
Ankit Agarwal [Mon, 3 Nov 2014 06:06:25 +0000 (11:36 +0530)]
MDL-47922 tool_monitor: Add a config to disable the tool
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.
Rajesh Taneja [Tue, 4 Nov 2014 09:23:25 +0000 (17:23 +0800)]
MDL-45416 enrol_ldap: Use null_progress_trace while running phpunit
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
Helen Foster [Tue, 4 Nov 2014 20:55:26 +0000 (21:55 +0100)]
MDL-48035 Merge English strings from the en_fix language pack
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)
Dan Poltawski [Tue, 4 Nov 2014 16:50:47 +0000 (16:50 +0000)]
Merge branch 'MDL-47893-master' of git://github.com/zbdd/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
