Sam Hemelryk [Mon, 10 Nov 2014 22:07:37 +0000 (11:07 +1300)]
MDL-47434 format_topics: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
Sam Hemelryk [Mon, 10 Nov 2014 22:07:37 +0000 (11:07 +1300)]
MDL-47434 format_weeks: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
Eloy Lafuente (stronk7) [Thu, 13 Nov 2014 11:14:36 +0000 (12:14 +0100)]
weekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)]
Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle
Helen Foster [Thu, 13 Nov 2014 10:22:49 +0000 (11:22 +0100)]
MDL-48214 Merge English strings from the en_fix language pack
Eugene Venter [Wed, 12 Nov 2014 20:34:37 +0000 (09:34 +1300)]
MDL-48204 mod_wiki: admin.php - fix syntax error
Dan Poltawski [Wed, 12 Nov 2014 11:33:20 +0000 (11:33 +0000)]
weekly release 2.9dev
Dan Poltawski [Wed, 12 Nov 2014 11:22:45 +0000 (11:22 +0000)]
MDL-48174 tool_langimport: info about skipped update
So admins can work out why the task might not be having an effect.
Dan Poltawski [Wed, 12 Nov 2014 11:03:43 +0000 (11:03 +0000)]
Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 12 Nov 2014 03:53:14 +0000 (11:53 +0800)]
MDL-30968 mod_forum: No picture link to group when no groups mode
Sam Hemelryk [Tue, 11 Nov 2014 23:33:25 +0000 (12:33 +1300)]
Merge branch 'MDL-47391_master' of github.com:ninelanterns/moodle
Sam Hemelryk [Tue, 11 Nov 2014 20:41:58 +0000 (09:41 +1300)]
Merge branch 'MDL-39692-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 11 Nov 2014 19:58:52 +0000 (08:58 +1300)]
Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle
Dan Poltawski [Tue, 11 Nov 2014 19:23:51 +0000 (19:23 +0000)]
MDL-47502 statslib tests: improve test
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
Eugene Venter [Sun, 19 Oct 2014 21:50:58 +0000 (10:50 +1300)]
MDL-47502 test_statslib_cron_daily: fix provider
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
Dan Poltawski [Tue, 11 Nov 2014 19:05:45 +0000 (19:05 +0000)]
Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Nov 2014 18:59:55 +0000 (18:59 +0000)]
Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 11 Nov 2014 18:48:39 +0000 (18:48 +0000)]
Merge branch 'MDL-48168' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)]
Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 11 Nov 2014 17:16:00 +0000 (17:16 +0000)]
Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle
Rajesh Taneja [Tue, 11 Nov 2014 08:42:52 +0000 (16:42 +0800)]
MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
Dan Poltawski [Tue, 11 Nov 2014 08:07:19 +0000 (08:07 +0000)]
Merge branch 'MDL-48144' of git://github.com/stronk7/moodle
Tim Hunt [Mon, 10 Nov 2014 18:46:53 +0000 (18:46 +0000)]
MDL-48168 quiz editing: max grade should be editable after attempts
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 17:08:15 +0000 (18:08 +0100)]
MDL-48144 upgrade: add v2.8.0 sep lines
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 16:39:54 +0000 (17:39 +0100)]
Merge branch 'MDL-48143' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 16:32:34 +0000 (17:32 +0100)]
MDL-48143 backup: Bump release to 2.9 dev branch
sam marshall [Thu, 6 Nov 2014 11:54:09 +0000 (11:54 +0000)]
MDL-48093 HTML 5 video: Firefox now supports .mp4
David Mudrák [Mon, 10 Nov 2014 10:09:25 +0000 (11:09 +0100)]
MDL-48156 task: Skip the scheduled task only for really disabled plugins
Darko Miletic [Tue, 28 May 2013 21:30:41 +0000 (18:30 -0300)]
MDL-39376 enrol: Optimized setting for ldap and database
Frederic Massart [Mon, 10 Nov 2014 04:59:59 +0000 (12:59 +0800)]
MDL-39692 grade: Little code clean up of letter boundary deletion
Huy Hoang [Mon, 10 Nov 2014 04:14:31 +0000 (12:14 +0800)]
MDL-39692 grade: Ability to delete letter boundary
James Ballard [Wed, 24 Sep 2014 03:02:56 +0000 (13:02 +1000)]
MDL-47391 Update pagelayout for default profile configuration
Eloy Lafuente (stronk7) [Sun, 9 Nov 2014 03:04:17 +0000 (04:04 +0100)]
weekly back-to-dev release 2.9dev
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
