moodle.git
7 years agoMDL-48748 lang: Merge English strings from the en_fix language pack
Helen Foster [Tue, 6 Jan 2015 19:42:09 +0000 (20:42 +0100)]
MDL-48748 lang: Merge English strings from the en_fix language pack

7 years agoweekly release 2.9dev
Dan Poltawski [Wed, 24 Dec 2014 13:22:20 +0000 (13:22 +0000)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Wed, 24 Dec 2014 13:22:18 +0000 (13:22 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMerge branch 'MDL-48213-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 23 Dec 2014 16:13:25 +0000 (16:13 +0000)]
Merge branch 'MDL-48213-master' of https://github.com/dthies/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 23 Dec 2014 16:04:13 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMDL-45699 behat: Don't use behat/lib.php functions in core.
Eloy Lafuente (stronk7) [Tue, 23 Dec 2014 11:29:44 +0000 (12:29 +0100)]
MDL-45699 behat: Don't use behat/lib.php functions in core.

behat/lib.php script should not be usually included, neither any of its functions
used within mooodle code at all. It's for exclusive use of behat and
moodle setup.php. For places requiring a different/special behavior
needing to check if are being run  as part of behat tests, use:
    if (defined('BEHAT_SITE_RUNNING')) { ...

7 years agoRevert "Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle"
Dan Poltawski [Tue, 23 Dec 2014 10:46:39 +0000 (10:46 +0000)]
Revert "Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle"

This reverts commit b8572fa90435390fc18c2fe537403f7931d966aa, reversing
changes made to 172d7f16cecc7c666352086d40f4d5e84c714d32.

7 years agoRevert "Merge branch 'patch-1' of https://github.com/jrchamp/moodle"
Dan Poltawski [Tue, 23 Dec 2014 10:42:47 +0000 (10:42 +0000)]
Revert "Merge branch 'patch-1' of https://github.com/jrchamp/moodle"

This reverts commit d61ecfffe5a568bf1e6cb7684264272413ff5766, reversing
changes made to e04cf8d83fa0f392f9ce8ee50d94610b7073e73d.

7 years agoMerge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 23 Dec 2014 10:20:44 +0000 (10:20 +0000)]
Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-42616-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Tue, 23 Dec 2014 09:51:31 +0000 (09:51 +0000)]
Merge branch 'MDL-42616-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-42616 core: Adding tool_filetypes to the standard plugins list
Frederic Massart [Tue, 23 Dec 2014 04:04:02 +0000 (12:04 +0800)]
MDL-42616 core: Adding tool_filetypes to the standard plugins list

7 years agoMerge branch '45699-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Dec 2014 01:01:36 +0000 (02:01 +0100)]
Merge branch '45699-29' of git://github.com/samhemelryk/moodle

Conflicts:
cache/upgrade.txt

7 years agoMDL-48568 cache: make tests aware of default application store
Eloy Lafuente (stronk7) [Thu, 18 Dec 2014 22:41:44 +0000 (23:41 +0100)]
MDL-48568 cache: make tests aware of default application store

When an alternative cache configuration is used, aka:

define('TEST_CACHE_USING_ALT_CACHE_CONFIG_PATH', true);
$CFG->altcacheconfigpath = '/tmp/xxxxx.php';

the get_expected_application_cache_store() method was not able of
retroffiting the default application store being used.

This commit just implements that functionality so, when
executing unit tests using alternative configuration, assertions
looking for that will pass without a problem.

7 years agoMerge branch '48568-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 23 Dec 2014 00:34:12 +0000 (01:34 +0100)]
Merge branch '48568-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-48593-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 22 Dec 2014 20:50:50 +0000 (21:50 +0100)]
Merge branch 'MDL-48593-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48639' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Dec 2014 18:09:43 +0000 (19:09 +0100)]
Merge branch 'MDL-48639' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 22 Dec 2014 17:29:43 +0000 (17:29 +0000)]
Merge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle

7 years agoMerge branch 'MDL-25979_master' of https://github.com/crazyserver/moodle
Dan Poltawski [Mon, 22 Dec 2014 17:27:08 +0000 (17:27 +0000)]
Merge branch 'MDL-25979_master' of https://github.com/crazyserver/moodle

7 years agoMerge branch 'master-48421' of https://github.com/timpricecatalyst/moodle
Dan Poltawski [Mon, 22 Dec 2014 17:00:19 +0000 (17:00 +0000)]
Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle

7 years agoMerge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 22 Dec 2014 16:34:48 +0000 (16:34 +0000)]
Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-48638 course: update unit test to new message
Dan Poltawski [Mon, 22 Dec 2014 16:23:04 +0000 (16:23 +0000)]
MDL-48638 course: update unit test to new message

7 years agoMerge branch 'MDL-42166-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:38:49 +0000 (15:38 +0000)]
Merge branch 'MDL-42166-master' of git://github.com/xow/moodle

7 years agoMerge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:25:25 +0000 (15:25 +0000)]
Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:22:37 +0000 (15:22 +0000)]
Merge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle

7 years agoMDL-43004 blog: fix upgrade.txt typo
Dan Poltawski [Mon, 22 Dec 2014 15:13:41 +0000 (15:13 +0000)]
MDL-43004 blog: fix upgrade.txt typo

7 years agoMerge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 22 Dec 2014 15:09:53 +0000 (15:09 +0000)]
Merge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle

7 years agoMDL-44260 uplodate: move deprecated functions to deprecatedlib
Dan Poltawski [Mon, 22 Dec 2014 15:07:59 +0000 (15:07 +0000)]
MDL-44260 uplodate: move deprecated functions to deprecatedlib

7 years agoMerge branch 'MDL-44260-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:57:30 +0000 (14:57 +0000)]
Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-48062-master' of https://github.com/dthies/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:36:46 +0000 (14:36 +0000)]
Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'm29_MDL-48423' of https://github.com/totara/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:15:09 +0000 (14:15 +0000)]
Merge branch 'm29_MDL-48423' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-48224-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 22 Dec 2014 14:04:05 +0000 (14:04 +0000)]
Merge branch 'MDL-48224-master' of git://github.com/xow/moodle

7 years agoMerge branch 'MDL-48445-master' of https://github.com/jmarshall-netspot/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:56:19 +0000 (13:56 +0000)]
Merge branch 'MDL-48445-master' of https://github.com/jmarshall-netspot/moodle

7 years agoMerge branch 'MDL-48534_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:52:36 +0000 (13:52 +0000)]
Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'm29_MDL-48483' of https://github.com/totara/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:43:51 +0000 (13:43 +0000)]
Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-48580-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:41:11 +0000 (13:41 +0000)]
Merge branch 'MDL-48580-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'patch-1' of https://github.com/jrchamp/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:37:52 +0000 (13:37 +0000)]
Merge branch 'patch-1' of https://github.com/jrchamp/moodle

7 years agoMDL-48653 behat: fix incorrect phpdoc
Dan Poltawski [Mon, 22 Dec 2014 13:12:48 +0000 (13:12 +0000)]
MDL-48653 behat: fix incorrect phpdoc

7 years agoMerge branch 'MDL-48653' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:10:44 +0000 (13:10 +0000)]
Merge branch 'MDL-48653' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-48088-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 22 Dec 2014 13:05:51 +0000 (13:05 +0000)]
Merge branch 'MDL-48088-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 22 Dec 2014 12:13:31 +0000 (12:13 +0000)]
Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-48666' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Dec 2014 11:53:15 +0000 (11:53 +0000)]
Merge branch 'MDL-48666' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-48244' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 22 Dec 2014 11:16:41 +0000 (11:16 +0000)]
Merge branch 'MDL-48244' of git://github.com/jmvedrine/moodle

7 years agoMDL-25979 signup: Usability message for recaptcha label form
Pau Ferrer Ocaña [Thu, 11 Dec 2014 09:32:20 +0000 (10:32 +0100)]
MDL-25979 signup: Usability message for recaptcha label form

7 years agoMDL-48643 Javascript: Create modals hidden, then show, to prevent scroll
Eric Merrill [Wed, 17 Dec 2014 20:20:34 +0000 (15:20 -0500)]
MDL-48643 Javascript: Create modals hidden, then show, to prevent scroll

Modal dialogs need to be created with visible: false and then call
.show() on it to make it visible. This prevents the page from jumping to
the top.

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 21 Dec 2014 16:04:08 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMDL-48244 Lesson: add custom end of lesson reached completion rule
Jean-Michel Vedrine [Sat, 22 Nov 2014 14:46:04 +0000 (15:46 +0100)]
MDL-48244 Lesson: add custom end of lesson reached completion rule

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 20 Dec 2014 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 19 Dec 2014 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMDL-42616 filelib: New user interface to edit and add file types (2/2)
sam marshall [Thu, 27 Nov 2014 18:33:39 +0000 (18:33 +0000)]
MDL-42616 filelib: New user interface to edit and add file types (2/2)

New admin tool tool_filetypes which uses the new API to add and
modify file type definitions.

7 years agoMDL-42616 filelib: Use config value for custom MIME types (1/2)
sam marshall [Mon, 15 Dec 2014 10:41:47 +0000 (10:41 +0000)]
MDL-42616 filelib: Use config value for custom MIME types (1/2)

Uses a new optional config variable to define custom MIME types
in JSON format. Includes new API for accessing and modifying
this data.

7 years agoMDL-48666 quiz: let JS to get a Qs slot number on the summary page
Tim Hunt [Fri, 19 Dec 2014 14:34:23 +0000 (14:34 +0000)]
MDL-48666 quiz: let JS to get a Qs slot number on the summary page

7 years agoMDL-48639 behat upload: support absolute paths & better errors
Tim Hunt [Wed, 17 Dec 2014 16:26:49 +0000 (16:26 +0000)]
MDL-48639 behat upload: support absolute paths & better errors

In a custom step I needed to be able to upload a file I had previously
saved to $CFG->dataroot/temp, but that was not possible.

Also, the failure was not at all obvious. I have made it throw a clear
exception if the file you are trying to upload does not exist.

7 years agoMDL-48483 admin: attached color label to input control
Brian Barnes [Fri, 19 Dec 2014 01:26:18 +0000 (14:26 +1300)]
MDL-48483 admin: attached color label to input control

7 years agoMDL-40864 theme: Tidy up Bootstrapbase / Clean / More home links.
Mary Evans [Wed, 17 Dec 2014 13:56:53 +0000 (13:56 +0000)]
MDL-40864 theme: Tidy up Bootstrapbase / Clean / More home links.

7 years agoMDL-48062 atto_image: Add image select on single click
Daniel Thies [Thu, 13 Nov 2014 02:41:28 +0000 (20:41 -0600)]
MDL-48062 atto_image: Add image select on single click

7 years agoMDL-48213 filter_algebra,filter_tex: Require sesskey for debug actions
Daniel Thies [Thu, 18 Dec 2014 22:30:52 +0000 (16:30 -0600)]
MDL-48213 filter_algebra,filter_tex: Require sesskey for debug actions

7 years agoMDL-48421 navigation: accounting for potential regression
Tim Price [Tue, 16 Dec 2014 00:45:10 +0000 (11:45 +1100)]
MDL-48421 navigation: accounting for potential regression

7 years agoMDL-48421 navigation: correctly load child categories if parent is loaded
Tim Price [Sun, 30 Nov 2014 23:44:49 +0000 (10:44 +1100)]
MDL-48421 navigation: correctly load child categories if parent is loaded

7 years agoMDL-48653 behat: Steps to click and dismiss a dialogue.
Tim Hunt [Thu, 18 Dec 2014 19:29:29 +0000 (19:29 +0000)]
MDL-48653 behat: Steps to click and dismiss a dialogue.

We already had the corresponding
    I click on "Home" "link" confirming the dialogue
but I needed the opposite
    I click on "Home" "link" dismissing the dialogue

7 years agoMDL-48638 database SQL: Fix typo in exception constructor
Eric Merrill [Thu, 18 Dec 2014 18:31:36 +0000 (13:31 -0500)]
MDL-48638 database SQL: Fix typo in exception constructor

7 years agoMDL-48591 calendar: Mini Cal Display DST Events
jrchamp [Fri, 12 Dec 2014 22:48:31 +0000 (17:48 -0500)]
MDL-48591 calendar: Mini Cal Display DST Events

7 years agoweekly release 2.9dev
Dan Poltawski [Thu, 18 Dec 2014 11:24:59 +0000 (11:24 +0000)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 18 Dec 2014 11:24:57 +0000 (11:24 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMerge branch 'MDL-43902-master-fixup' of https://github.com/FMCorz/moodle
Andrew Nicols [Thu, 18 Dec 2014 06:45:30 +0000 (14:45 +0800)]
Merge branch 'MDL-43902-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-43902 cohort: Fix behat failure because attribute does not exist
Frederic Massart [Thu, 18 Dec 2014 06:34:57 +0000 (14:34 +0800)]
MDL-43902 cohort: Fix behat failure because attribute does not exist

7 years agoMerge branch 'MDL-45324_master' of https://github.com/markn86/moodle
Andrew Nicols [Thu, 18 Dec 2014 06:07:46 +0000 (14:07 +0800)]
Merge branch 'MDL-45324_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle
David Monllao [Thu, 18 Dec 2014 04:35:55 +0000 (12:35 +0800)]
Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle

7 years agoMDL-47442 mod_assign: Notify student when quick-grading grade
Zachary Durber [Thu, 18 Dec 2014 04:10:01 +0000 (12:10 +0800)]
MDL-47442 mod_assign: Notify student when quick-grading grade

7 years agoMDL-38663 login: Remove login info from forgot password page
Andrew Nicols [Thu, 18 Dec 2014 00:40:57 +0000 (08:40 +0800)]
MDL-38663 login: Remove login info from forgot password page

Since this is checked in several locations, I have introduced a new
protected function to check whether the current page is a login page.

This could potentially be exposed as a public function, but Sam's original
comment suggests that this is undesirable.

7 years agoMDL-48452 Completion: js correction to behat test
Marina Glancy [Thu, 18 Dec 2014 02:01:30 +0000 (10:01 +0800)]
MDL-48452 Completion: js correction to behat test

7 years agoMDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle
John Okely [Thu, 18 Dec 2014 01:52:34 +0000 (09:52 +0800)]
MDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle

7 years agoMDL-48423 messages: improved accessibility of contacts list
Brian Barnes [Mon, 1 Dec 2014 01:14:25 +0000 (14:14 +1300)]
MDL-48423 messages: improved accessibility of contacts list

7 years agoMDL-43730 mod_book: Automate MDLQA-2426
Ankit Agarwal [Thu, 27 Nov 2014 05:09:47 +0000 (10:39 +0530)]
MDL-43730 mod_book: Automate MDLQA-2426

Behat feature to make sure show/hide feature for book chapter works as expected

7 years agoMDL-43730 mod_book: Make chapter action links accessible
Ankit Agarwal [Wed, 26 Nov 2014 07:58:49 +0000 (13:28 +0530)]
MDL-43730 mod_book: Make chapter action links accessible

7 years agoMerge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle
Dan Poltawski [Wed, 17 Dec 2014 10:11:40 +0000 (10:11 +0000)]
Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle

7 years agoMDL-43004 blog: Deprecation of parameter $action in add_association/s()
Frederic Massart [Wed, 17 Dec 2014 02:51:16 +0000 (10:51 +0800)]
MDL-43004 blog: Deprecation of parameter $action in add_association/s()

7 years agoMerge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 17 Dec 2014 09:12:34 +0000 (10:12 +0100)]
Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle

7 years agoMDL-48534 mod_assign: display correct workflow state and marker
Mark Nelson [Wed, 17 Dec 2014 07:52:22 +0000 (23:52 -0800)]
MDL-48534 mod_assign: display correct workflow state and marker

7 years agoMDL-45324 mod_assign: always notify students when requested
Mark Nelson [Wed, 17 Dec 2014 07:41:00 +0000 (23:41 -0800)]
MDL-45324 mod_assign: always notify students when requested

7 years agoMDL-44260 core_deprecated: final deprecation of clam related methods
Simey Lameze [Wed, 17 Dec 2014 07:10:33 +0000 (15:10 +0800)]
MDL-44260 core_deprecated: final deprecation of clam related methods

7 years agoMDL-44260 core_file: final deprecation of upload_manager class and clam functions
Simey Lameze [Wed, 17 Dec 2014 07:10:13 +0000 (15:10 +0800)]
MDL-44260 core_file: final deprecation of upload_manager class and clam functions

7 years agoMDL-44829 libraries: Update android user agent detection
BKelada [Thu, 27 Mar 2014 06:30:05 +0000 (17:30 +1100)]
MDL-44829 libraries: Update android user agent detection

7 years agoMerge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle
David Monllao [Wed, 17 Dec 2014 03:48:42 +0000 (11:48 +0800)]
Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-46122 libraries: Final deprecation of file lib/pluginlib.php
Frederic Massart [Mon, 8 Dec 2014 08:14:32 +0000 (16:14 +0800)]
MDL-46122 libraries: Final deprecation of file lib/pluginlib.php

7 years agoMDL-48593 messageinbound: Correct header retrieval from IMAP server
Andrew Nicols [Tue, 16 Dec 2014 01:32:30 +0000 (09:32 +0800)]
MDL-48593 messageinbound: Correct header retrieval from IMAP server

Header retrieval should only be performed on the base message, and not each
part of the message as is currently performed.

This came to light because Google changed their IMAP server such that, if
you inform the data query that you wish to retrieve the headerText for a
part which does not contain a MIME header, then no message is retrieved in
the search causing a general failure of the IMAP fetch.

In normal circumstances, headers should only be a part of the base message
part.

7 years agoMDL-48482 core_admin: version change to add new lang strings
David Monllao [Wed, 17 Dec 2014 00:54:46 +0000 (08:54 +0800)]
MDL-48482 core_admin: version change to add new lang strings

7 years agoMerge branch 'm29_MDL-48482' of git://github.com/totara/moodle
David Monllao [Wed, 17 Dec 2014 00:52:58 +0000 (08:52 +0800)]
Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle

7 years agoMDL-48482 core_admin: Added additional label for durations
Brian Barnes [Thu, 4 Dec 2014 00:42:35 +0000 (13:42 +1300)]
MDL-48482 core_admin: Added additional label for durations

7 years agoMerge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle
Dan Poltawski [Tue, 16 Dec 2014 19:20:22 +0000 (19:20 +0000)]
Merge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle

7 years agoMerge branch 'MDL-42501-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 16 Dec 2014 19:17:57 +0000 (19:17 +0000)]
Merge branch 'MDL-42501-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 16 Dec 2014 18:52:40 +0000 (18:52 +0000)]
Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch '38663-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 16 Dec 2014 18:45:33 +0000 (18:45 +0000)]
Merge branch '38663-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-48452-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 18:21:40 +0000 (19:21 +0100)]
Merge branch 'MDL-48452-master' of https://github.com/sammarshallou/moodle

7 years agoMDL-48452 Completion: Expected date doesn't save when form is locked
sam marshall [Tue, 9 Dec 2014 12:42:14 +0000 (12:42 +0000)]
MDL-48452 Completion: Expected date doesn't save when form is locked

The completion fields are locked when a user has already completed the
task, to prevent you accidentally causing it to recalculate the data.

This lock doesn't apply to the expected date field, as this doesn't
affect user completion. However, changes to the field in this
situation were incorrectly not saved.

7 years agoMerge branch 'MDL-48587-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 16 Dec 2014 17:05:03 +0000 (17:05 +0000)]
Merge branch 'MDL-48587-master' of git://github.com/xow/moodle

7 years agoMerge branch '34041-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 15:35:47 +0000 (16:35 +0100)]
Merge branch '34041-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'm29_MDL-48532' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 16 Dec 2014 14:47:06 +0000 (15:47 +0100)]
Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-46442-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 16 Dec 2014 13:52:52 +0000 (13:52 +0000)]
Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle

7 years agoMerge branch 'MDL-47610-master' of git://github.com/zbdd/moodle
Dan Poltawski [Tue, 16 Dec 2014 12:59:45 +0000 (12:59 +0000)]
Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle

7 years agoMerge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 16 Dec 2014 12:44:22 +0000 (12:44 +0000)]
Merge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle