moodle.git
7 years agoMerge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)]
Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-43127 tool_uploadcourse: Empty enrolment method is acceptable
Frederic Massart [Wed, 26 Nov 2014 09:11:35 +0000 (17:11 +0800)]
MDL-43127 tool_uploadcourse: Empty enrolment method is acceptable

Without the patch a course would not be created if it contained
an enrolment method column with an empty value. e.g.:

shortname,fullname,category,enrolment_1,enrolment_1_disable
courserestored,Course restored,1,,
courserestored2,Course restored 2,manual,1

7 years agoMerge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 26 Nov 2014 08:20:36 +0000 (08:20 +0000)]
Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle

7 years agoMDL-48210 updates checker: Fix empty return type
David Mudrák [Wed, 26 Nov 2014 08:07:50 +0000 (09:07 +0100)]
MDL-48210 updates checker: Fix empty return type

Credit goes to Marina Glancy for catching during the testing.

7 years agoMDL-48148 mod_forum: Use correct original subject when handling replies
Andrew Nicols [Wed, 26 Nov 2014 07:58:05 +0000 (15:58 +0800)]
MDL-48148 mod_forum: Use correct original subject when handling replies

7 years agoMerge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 25 Nov 2014 20:06:08 +0000 (09:06 +1300)]
Merge branch 'MDL-22309_master' of git://github.com/dmonllao/moodle

7 years agoMDL-48191 gradebook: fixed floating headers when emails not displayed
Jetha Chan [Mon, 17 Nov 2014 02:17:53 +0000 (10:17 +0800)]
MDL-48191 gradebook: fixed floating headers when emails not displayed

7 years agoMerge branch 'MDL-47329-master' of git://github.com/jethac/moodle
Sam Hemelryk [Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)]
Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 17:45:26 +0000 (18:45 +0100)]
Merge branch 'MDL-48276-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 17:38:24 +0000 (18:38 +0100)]
Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch '23538-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 16:00:06 +0000 (17:00 +0100)]
Merge branch '23538-29' of git://github.com/samhemelryk/moodle

Conflicts:
backup/util/ui/renderer.php

7 years agoMDL-48036 course: change multilang cache key
Heiko Schach [Fri, 21 Nov 2014 07:40:45 +0000 (15:40 +0800)]
MDL-48036 course: change multilang cache key

7 years agoMDL-46356 assign: remove unnecessary get_area_files call
Ashley Holman [Mon, 14 Jul 2014 09:17:38 +0000 (18:47 +0930)]
MDL-46356 assign: remove unnecessary get_area_files call

7 years agoMerge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 13:59:33 +0000 (13:59 +0000)]
Merge branch 'MDL-31500_master-revert-ui-changes' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-41155-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 25 Nov 2014 13:18:13 +0000 (13:18 +0000)]
Merge branch 'MDL-41155-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 12:21:47 +0000 (13:21 +0100)]
Merge branch 'MDL-48210-master-checker-caching' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:28:19 +0000 (11:28 +0000)]
Merge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:21:19 +0000 (11:21 +0000)]
Merge branch 'MDL-46416-master-bare' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:18:50 +0000 (11:18 +0000)]
Merge branch 'MDL-43127-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Nov 2014 11:07:50 +0000 (11:07 +0000)]
Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle

7 years agoMerge branch '48189-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)]
Merge branch '48189-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-46416 group: Allow group pictures to be deleted
Frederic Massart [Thu, 6 Nov 2014 07:39:12 +0000 (15:39 +0800)]
MDL-46416 group: Allow group pictures to be deleted

7 years agoMDL-46416 group: Use a revision number for group pictures
Frederic Massart [Thu, 6 Nov 2014 07:23:58 +0000 (15:23 +0800)]
MDL-46416 group: Use a revision number for group pictures

7 years agoMDL-43127 tool_uploadcourse: Add support for more enrolment methods
Frederic Massart [Thu, 20 Nov 2014 10:12:02 +0000 (18:12 +0800)]
MDL-43127 tool_uploadcourse: Add support for more enrolment methods

7 years agoMerge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 25 Nov 2014 02:54:12 +0000 (15:54 +1300)]
Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-38128 mod_assign: Adding group selector to grading summary page
David Monllao [Wed, 19 Nov 2014 06:37:12 +0000 (14:37 +0800)]
MDL-38128 mod_assign: Adding group selector to grading summary page

Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.

7 years agoMDL-31500 backup: Warn users about front page backups
David Monllao [Tue, 25 Nov 2014 02:26:15 +0000 (10:26 +0800)]
MDL-31500 backup: Warn users about front page backups

They should know that they can only be restored on the front
page before selecting the destination course.

7 years agoMDL-31500 backup: Remove frontpage restore UI restrictions
David Monllao [Tue, 25 Nov 2014 01:37:53 +0000 (09:37 +0800)]
MDL-31500 backup: Remove frontpage restore UI restrictions

7 years agoMDL-23839 navigation: fixed php5.5ism
Sam Hemelryk [Tue, 25 Nov 2014 01:35:30 +0000 (14:35 +1300)]
MDL-23839 navigation: fixed php5.5ism

7 years agoMerge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)]
Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch '48334-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 25 Nov 2014 00:18:11 +0000 (01:18 +0100)]
Merge branch '48334-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-23912 core_comment: update count after deletion
Jetha Chan [Mon, 17 Nov 2014 06:22:14 +0000 (14:22 +0800)]
MDL-23912 core_comment: update count after deletion

7 years agoMerge branch '38343-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)]
Merge branch '38343-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '48304-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:23:42 +0000 (00:23 +0100)]
Merge branch '48304-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)]
Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:52:42 +0000 (10:52 +1300)]
Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-48259' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:49:54 +0000 (10:49 +1300)]
Merge branch 'MDL-48259' of git://github.com/timhunt/moodle

7 years agoMerge branch 'm29_MDL-48265' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:42:46 +0000 (09:42 +1300)]
Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle

7 years agoMerge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:39:33 +0000 (09:39 +1300)]
Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle

7 years agoMDL-20365 auth_db: post integration tweaks
Sam Hemelryk [Mon, 24 Nov 2014 20:05:20 +0000 (09:05 +1300)]
MDL-20365 auth_db: post integration tweaks

* Fixes SQL indentation.
* Amended the new auth_dbsaltedcrypt string.

7 years agoMerge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2...
Sam Hemelryk [Mon, 24 Nov 2014 19:19:04 +0000 (08:19 +1300)]
Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle

7 years agoMerge branch '47832-29-removed' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:29:33 +0000 (17:29 +0000)]
Merge branch '47832-29-removed' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:26:30 +0000 (17:26 +0000)]
Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle

7 years agoMerge branch 'MDL-45867-master' of https://github.com/dthies/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:11:14 +0000 (17:11 +0000)]
Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'MDL-47601_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:02:09 +0000 (17:02 +0000)]
Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)]
Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 24 Nov 2014 15:37:56 +0000 (15:37 +0000)]
Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 24 Nov 2014 12:03:14 +0000 (12:03 +0000)]
Merge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:56:56 +0000 (11:56 +0000)]
Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:53:53 +0000 (11:53 +0000)]
Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:07:20 +0000 (11:07 +0000)]
Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 24 Nov 2014 10:55:27 +0000 (10:55 +0000)]
Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle

Conflicts:
backup/util/ui/renderer.php

7 years agoMDL-48210 updates checker: Improve cron notifications processing
David Mudrák [Tue, 18 Nov 2014 22:43:21 +0000 (23:43 +0100)]
MDL-48210 updates checker: Improve cron notifications processing

These are cosmetic improvements spotted while working on the issue.

1. Do not waste time if there are no changes to notify about.
2. Fix the legacy plugin manager's get_plugins() call.

7 years agoMDL-48210 plugin_manager: Invalidate caches after fetching updates info
David Mudrák [Tue, 18 Nov 2014 22:37:06 +0000 (23:37 +0100)]
MDL-48210 plugin_manager: Invalidate caches after fetching updates info

7 years agoMerge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 24 Nov 2014 02:57:59 +0000 (15:57 +1300)]
Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 24 Nov 2014 02:53:56 +0000 (15:53 +1300)]
Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle

7 years agoMDL-22309 report_singleview: Fixing wrong uses of get_role_users()
David Monllao [Mon, 24 Nov 2014 02:50:39 +0000 (10:50 +0800)]
MDL-22309 report_singleview: Fixing wrong uses of get_role_users()

7 years agoMDL-22309 accesslib: Preventing incorrect get_role_users() uses
David Monllao [Mon, 24 Nov 2014 02:46:04 +0000 (10:46 +0800)]
MDL-22309 accesslib: Preventing incorrect get_role_users() uses

7 years agoMerge branch 'MDL-48064-master' of https://github.com/dthies/moodle
Sam Hemelryk [Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)]
Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle

7 years agoMDL-22309 accesslib: Adding unit test to expose the issue
David Monllao [Mon, 17 Nov 2014 07:03:57 +0000 (15:03 +0800)]
MDL-22309 accesslib: Adding unit test to expose the issue

7 years agoMDL-25763 tool_replace: Returning correct error code
David Monllao [Fri, 21 Nov 2014 02:40:06 +0000 (10:40 +0800)]
MDL-25763 tool_replace: Returning correct error code

7 years agoMDL-48148 mod_forum: Use the standard forum reply subject as default
Andrew Nicols [Mon, 10 Nov 2014 06:12:52 +0000 (14:12 +0800)]
MDL-48148 mod_forum: Use the standard forum reply subject as default

When a user replies by e-mail, the course name has been included in the
original e-mail. As a result, the reply subject becomes longer and longer.

In cases whether either:
* the discussion name; or
* the replied-to-post subject

is present in the mail subject, the standard reply subject is instead used.

7 years agoMDL-43483 mod_chat: Fixed race condition issues, including not useful logs.
Matteo Scaramuccia [Sun, 22 Dec 2013 14:27:54 +0000 (15:27 +0100)]
MDL-43483 mod_chat: Fixed race condition issues, including not useful logs.

7 years agoMerge branch 'MDL-35494_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 23 Nov 2014 21:06:00 +0000 (10:06 +1300)]
Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle

7 years agoMDL-48334 tool_messageinbound: phpdoc cleanup
Sam Hemelryk [Fri, 21 Nov 2014 21:57:36 +0000 (10:57 +1300)]
MDL-48334 tool_messageinbound: phpdoc cleanup

7 years agoMDL-48334 tool_messageinbound: cleanup @package @category
Sam Hemelryk [Fri, 21 Nov 2014 21:44:41 +0000 (10:44 +1300)]
MDL-48334 tool_messageinbound: cleanup @package @category

7 years agoMDL-31500 backup: Allow front page backup/restore
David Monllao [Thu, 13 Nov 2014 02:45:15 +0000 (10:45 +0800)]
MDL-31500 backup: Allow front page backup/restore

Removes restore on front page restrictions and allows
front page modules duplication.

7 years agoMDL-31500 backup: New unit test for front page backup/restore
David Monllao [Thu, 13 Nov 2014 07:22:34 +0000 (15:22 +0800)]
MDL-31500 backup: New unit test for front page backup/restore

7 years agoMDL-48063 behat: Fixed JS Exception
Rajesh Taneja [Wed, 5 Nov 2014 06:04:13 +0000 (14:04 +0800)]
MDL-48063 behat: Fixed JS Exception

M is not created on all pages, like cron and
Steps which check for exported data. So we need
to ensure M is defined, before using it in
behat_hooks::wait_for_pending_js()

7 years agoMDL-48288 gradebook: fix floating footer exception when averages disabled
Jetha Chan [Wed, 19 Nov 2014 07:08:02 +0000 (15:08 +0800)]
MDL-48288 gradebook: fix floating footer exception when averages disabled

The code we use to update styles on floating elements did not account for
situations where those floating elements don't exist. This was discovered
when a test site didn't have column averages enabled, resulting in no
floating footer element being created, so when _handleScrollEvent was
fired the first time, a null reference exception was thrown trying to
apply styles to a non-existent element.

7 years agoMDL-48302 behat: Reverted temp fix added by MDL-48251
Rajesh Taneja [Fri, 21 Nov 2014 02:39:42 +0000 (10:39 +0800)]
MDL-48302 behat: Reverted temp fix added by MDL-48251

7 years agoMDL-25763 tool_replace: cli version
Jonathon Fowler [Wed, 8 Oct 2014 22:54:38 +0000 (08:54 +1000)]
MDL-25763 tool_replace: cli version

7 years agoMDL-47329 mod_book: missing RTL styles, added page body selectors
Jetha Chan [Wed, 19 Nov 2014 08:45:15 +0000 (16:45 +0800)]
MDL-47329 mod_book: missing RTL styles, added page body selectors

7 years agoMDL-47329 mod_book: use embedded pagetype instead of hardcoded HTML
Jetha Chan [Wed, 19 Nov 2014 08:42:56 +0000 (16:42 +0800)]
MDL-47329 mod_book: use embedded pagetype instead of hardcoded HTML

7 years agoMDL-48302 behat: Reset all data, before starting behat suite
Rajesh Taneja [Thu, 20 Nov 2014 07:42:32 +0000 (15:42 +0800)]
MDL-48302 behat: Reset all data, before starting behat suite

7 years agoMDL-48302 behat: Make sure to clear php file cache
Rajesh Taneja [Thu, 20 Nov 2014 07:39:39 +0000 (15:39 +0800)]
MDL-48302 behat: Make sure to clear php file cache

7 years agoMDL-48302 behat: Reset cache before scenario
Rajesh Taneja [Thu, 20 Nov 2014 07:37:10 +0000 (15:37 +0800)]
MDL-48302 behat: Reset cache before scenario

7 years agoMDL-47834 auth: Allow enforcing of login limits
Petr Skoda [Thu, 23 Oct 2014 02:33:53 +0000 (15:33 +1300)]
MDL-47834 auth: Allow enforcing of login limits

7 years agoMDL-48282 Standardise update of user->firstaccess
Petr Skoda [Wed, 19 Nov 2014 01:16:41 +0000 (14:16 +1300)]
MDL-48282 Standardise update of user->firstaccess

7 years agoweekly release 2.9dev
Dan Poltawski [Thu, 20 Nov 2014 08:38:12 +0000 (08:38 +0000)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 20 Nov 2014 08:38:09 +0000 (08:38 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoRevert "MDL-46531 Make atto foreground colors and background colors configurable"
Dan Poltawski [Thu, 20 Nov 2014 07:03:48 +0000 (07:03 +0000)]
Revert "MDL-46531 Make atto foreground colors and background colors configurable"

This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-41155 Lesson: Fixed multiple question attempts logic
Dave Cooper [Thu, 20 Nov 2014 03:50:49 +0000 (11:50 +0800)]
MDL-41155 Lesson: Fixed multiple question attempts logic

Thanks to Rajneel Totaram for providing this patch.

7 years agoMDL-41155 Lesson: Added behat tests for multiple question attempts
Dave Cooper [Thu, 20 Nov 2014 03:50:32 +0000 (11:50 +0800)]
MDL-41155 Lesson: Added behat tests for multiple question attempts

7 years agoNOBUG: fixed commit message typo
Sam Hemelryk [Thu, 20 Nov 2014 03:47:33 +0000 (16:47 +1300)]
NOBUG: fixed commit message typo

7 years agoMDL-46531 editor_atto: fontcolor -> backcolor
Andrew Nicols [Thu, 20 Nov 2014 02:46:04 +0000 (10:46 +0800)]
MDL-46531 editor_atto: fontcolor -> backcolor

7 years agoMDL-48304 moodle_url: compare now considers anchor
Sam Hemelryk [Thu, 20 Nov 2014 02:38:34 +0000 (15:38 +1300)]
MDL-48304 moodle_url: compare now considers anchor

7 years agoMDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task.
Adrian Greeve [Tue, 18 Nov 2014 05:58:33 +0000 (13:58 +0800)]
MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task.

7 years agoMDL-47832 cache: removed data source aggregate functionality
Sam Hemelryk [Wed, 19 Nov 2014 22:02:52 +0000 (11:02 +1300)]
MDL-47832 cache: removed data source aggregate functionality

Cache data source aggregate functionality was found to be broken
and unused, because of this the decision was made to remove it
rather than fix it.
As it was broken we did not follow typical deprecation methods and
instead the code was removed outright with only structure
remaining and left deprecated.

7 years agoMDL-43628 mod_assign: fixed formatting of statement
Sam Hemelryk [Wed, 19 Nov 2014 21:18:09 +0000 (10:18 +1300)]
MDL-43628 mod_assign: fixed formatting of statement

7 years agoMerge branch '48206-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Nov 2014 20:18:37 +0000 (21:18 +0100)]
Merge branch '48206-29' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)]
Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle

7 years agoMDL-48251 behat: Shuffling activity creation fix quiz behat
Rajesh Taneja [Wed, 19 Nov 2014 08:23:58 +0000 (16:23 +0800)]
MDL-48251 behat: Shuffling activity creation fix quiz behat

7 years agoMDL-9443 core_files: Also filter .xhtml resources.
David Balch [Wed, 19 Nov 2014 14:14:50 +0000 (14:14 +0000)]
MDL-9443 core_files: Also filter .xhtml resources.

Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".

7 years agoMDL-29585 wiki: fix unit test fails
Dan Poltawski [Wed, 19 Nov 2014 11:37:35 +0000 (11:37 +0000)]
MDL-29585 wiki: fix unit test fails

7 years agoMerge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 19 Nov 2014 10:29:10 +0000 (10:29 +0000)]
Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-29585 mod_wiki: Prevent broken links in editable sections
Frederic Massart [Wed, 19 Nov 2014 09:24:38 +0000 (17:24 +0800)]
MDL-29585 mod_wiki: Prevent broken links in editable sections

When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.

7 years agoMDL-46531 editor_atto: Handle a null selection better on colour change
Andrew Nicols [Wed, 19 Nov 2014 06:42:02 +0000 (14:42 +0800)]
MDL-46531 editor_atto: Handle a null selection better on colour change

Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.

7 years agoMerge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 19 Nov 2014 06:39:35 +0000 (06:39 +0000)]
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-48274 mod_forum: Add missing context to has_capability call
Mario Wehr [Wed, 19 Nov 2014 06:00:23 +0000 (14:00 +0800)]
MDL-48274 mod_forum: Add missing context to has_capability call