moodle.git
7 years agoMDL-49006 admin: activity descriptions shouldn't be required by default
Tim Hunt [Wed, 28 Jan 2015 21:52:58 +0000 (21:52 +0000)]
MDL-49006 admin: activity descriptions shouldn't be required by default

7 years agoweekly release 2.9dev
Andrew Nicols [Fri, 23 Jan 2015 00:27:32 +0000 (08:27 +0800)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Fri, 23 Jan 2015 00:27:25 +0000 (08:27 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMerge branch 'MDL-48949' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 22 Jan 2015 17:52:20 +0000 (17:52 +0000)]
Merge branch 'MDL-48949' of git://github.com/timhunt/moodle

7 years agoMDL-48949 mod_lti: tidy mod/lti/upgrade.txt
Tim Hunt [Thu, 22 Jan 2015 17:28:08 +0000 (17:28 +0000)]
MDL-48949 mod_lti: tidy mod/lti/upgrade.txt

7 years agoMerge branch 'MDL-48493-master-autodetect' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 22 Jan 2015 09:17:56 +0000 (10:17 +0100)]
Merge branch 'MDL-48493-master-autodetect' of git://github.com/mudrd8mz/moodle

7 years agoMDL-48493 admin: Fix PHP warning thrown if unable to detect component
David Mudrák [Thu, 22 Jan 2015 09:02:01 +0000 (10:02 +0100)]
MDL-48493 admin: Fix PHP warning thrown if unable to detect component

The method detect_plugin_component() returns false or string. The
normalize_component() expects strings only. Passing false to it
(typically when the plugin does not declare its component) caused the
PHP warning.

Credit goes to Ankit Agarwal for spotting this during testing.

7 years agoRevert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle"
Andrew Nicols [Thu, 22 Jan 2015 04:13:35 +0000 (12:13 +0800)]
Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle"

This reverts commit e08f58288af17bea8d55b66dae697d9d917053f4, reversing
changes made to 782ea98c59945864cfcc3ab44a6f17d49a9ed39f.

7 years agoMerge branch 'MDL-48823_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 21 Jan 2015 11:32:19 +0000 (12:32 +0100)]
Merge branch 'MDL-48823_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-348' of https://github.com/bostelm/moodle
Andrew Nicols [Wed, 21 Jan 2015 03:46:22 +0000 (11:46 +0800)]
Merge branch 'MDL-348' of https://github.com/bostelm/moodle

7 years agoMDL-48823 admin: Just one admin tree reload after settings changes
David Monllao [Wed, 14 Jan 2015 05:35:24 +0000 (13:35 +0800)]
MDL-48823 admin: Just one admin tree reload after settings changes

7 years agoMerge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 21 Jan 2015 02:21:24 +0000 (10:21 +0800)]
Merge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-48761 behat: Added new step for debugging scenarios
Rajesh Taneja [Thu, 15 Jan 2015 04:44:56 +0000 (12:44 +0800)]
MDL-48761 behat: Added new step for debugging scenarios

7 years agoMerge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 21 Jan 2015 01:52:55 +0000 (09:52 +0800)]
Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-28513 install: Add adminemail to the CLI installers
Andrew Nicols [Fri, 9 Jan 2015 06:08:33 +0000 (14:08 +0800)]
MDL-28513 install: Add adminemail to the CLI installers

7 years agoMerge branch 'wip-MDL-48847-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 23:28:30 +0000 (00:28 +0100)]
Merge branch 'wip-MDL-48847-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-48830-m' of https://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 23:03:56 +0000 (00:03 +0100)]
Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle

7 years agoMerge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 18:23:05 +0000 (19:23 +0100)]
Merge branch 'MDL-48873_master' of https://github.com/StudiUM/moodle

7 years agoMerge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 18:20:26 +0000 (19:20 +0100)]
Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle

7 years agoMerge branch 'wip-mdl-48837' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 17:48:18 +0000 (18:48 +0100)]
Merge branch 'wip-mdl-48837' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle
Dan Poltawski [Tue, 20 Jan 2015 17:50:19 +0000 (17:50 +0000)]
Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle

7 years agoMerge branch 'MDL-48477' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 17:44:08 +0000 (18:44 +0100)]
Merge branch 'MDL-48477' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-48779-29' of https://github.com/vadimonus/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 17:40:59 +0000 (18:40 +0100)]
Merge branch 'MDL-48779-29' of https://github.com/vadimonus/moodle

7 years agoMerge branch 'MDL-47792_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 17:32:32 +0000 (18:32 +0100)]
Merge branch 'MDL-47792_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 20 Jan 2015 17:20:58 +0000 (17:20 +0000)]
Merge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-48829' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Jan 2015 17:07:52 +0000 (17:07 +0000)]
Merge branch 'MDL-48829' of git://github.com/timhunt/moodle

7 years agoMerge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 16:07:34 +0000 (17:07 +0100)]
Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 20 Jan 2015 15:14:26 +0000 (16:14 +0100)]
Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48765-master' of git://github.com/mackensen/moodle
David Monllao [Tue, 20 Jan 2015 09:08:21 +0000 (17:08 +0800)]
Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle

7 years agoMerge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 20 Jan 2015 08:43:24 +0000 (16:43 +0800)]
Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-48776-master' of git://github.com/gurgus/moodle
David Monllao [Tue, 20 Jan 2015 08:07:34 +0000 (16:07 +0800)]
Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle
Andrew Nicols [Tue, 20 Jan 2015 07:42:11 +0000 (15:42 +0800)]
Merge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle

7 years agoMerge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 20 Jan 2015 06:00:41 +0000 (14:00 +0800)]
Merge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-44560-master' of git://github.com/xow/moodle
Andrew Nicols [Tue, 20 Jan 2015 04:57:41 +0000 (12:57 +0800)]
Merge branch 'MDL-44560-master' of git://github.com/xow/moodle

7 years agoMerge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 20 Jan 2015 04:34:07 +0000 (12:34 +0800)]
Merge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle

7 years agoMDL-47792 javascript: Fix for cropped headers and horizontal align
Aaron Barnes [Tue, 23 Dec 2014 23:31:57 +0000 (12:31 +1300)]
MDL-47792 javascript: Fix for cropped headers and horizontal align

7 years agoMerge branch 'MDL-43163' of git://github.com/jmvedrine/moodle
Andrew Nicols [Tue, 20 Jan 2015 03:23:41 +0000 (11:23 +0800)]
Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-48596' of git://github.com/jmvedrine/moodle
Andrew Nicols [Tue, 20 Jan 2015 02:54:19 +0000 (10:54 +0800)]
Merge branch 'MDL-48596' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-48741' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 20 Jan 2015 01:40:37 +0000 (09:40 +0800)]
Merge branch 'MDL-48741' of git://github.com/stronk7/moodle

7 years agoMDL-20053 mod_data: Update to fix unit tests.
Adrian Greeve [Thu, 15 Jan 2015 09:36:30 +0000 (17:36 +0800)]
MDL-20053 mod_data: Update to fix unit tests.

7 years agoMDL-20053 mod_data: Update to behat tests
Adrian Greeve [Thu, 15 Jan 2015 09:36:05 +0000 (17:36 +0800)]
MDL-20053 mod_data: Update to behat tests

A bulk delete of entries has been added to
the behat tests.

7 years agoMDL-20053 mod_data: Removal of individual DB call.
Adrian Greeve [Mon, 5 Jan 2015 01:38:17 +0000 (09:38 +0800)]
MDL-20053 mod_data: Removal of individual DB call.

The main functions for retrieving records have been
updated to include user picture information.

7 years agoMDL-48776 core_message: Fixed userid check.
Dave Cooper [Mon, 19 Jan 2015 05:16:48 +0000 (13:16 +0800)]
MDL-48776 core_message: Fixed userid check.

Thanks to Oleg Demeshev for providing the patch.

7 years agoMerge branch 'MDL-46976-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Mon, 19 Jan 2015 03:59:30 +0000 (11:59 +0800)]
Merge branch 'MDL-46976-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-48073-master' of git://github.com/gurgus/moodle
Andrew Nicols [Mon, 19 Jan 2015 03:36:47 +0000 (11:36 +0800)]
Merge branch 'MDL-48073-master' of git://github.com/gurgus/moodle

7 years agoMDL-48073 enrol: Fixed group filter resetting erroneously.
Nivedita Setru [Wed, 14 Jan 2015 02:28:22 +0000 (10:28 +0800)]
MDL-48073 enrol: Fixed group filter resetting erroneously.

7 years agoMDL-48624 behat: Added extended timeout in workshop step
Rajesh Taneja [Wed, 14 Jan 2015 01:33:38 +0000 (09:33 +0800)]
MDL-48624 behat: Added extended timeout in workshop step

i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.

7 years agoMDL-48624 behat: Added extended timeout to ensure step pass
Rajesh Taneja [Wed, 14 Jan 2015 01:31:54 +0000 (09:31 +0800)]
MDL-48624 behat: Added extended timeout to ensure step pass

following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site

7 years agoMerge branch 'MDL-43386' of git://github.com/jmvedrine/moodle
Andrew Nicols [Mon, 19 Jan 2015 01:24:44 +0000 (09:24 +0800)]
Merge branch 'MDL-43386' of git://github.com/jmvedrine/moodle

7 years agoMDL-43386 Lesson: Grade essay student response formatting not correct
Jean-Michel Vedrine [Sat, 11 Oct 2014 20:43:03 +0000 (22:43 +0200)]
MDL-43386 Lesson: Grade essay student response formatting not correct

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 17 Jan 2015 16:03:56 +0000 (00:03 +0800)]
Automatically generated installer lang files

7 years agoMDL-48873 auth_cas: Wrong redirection with bad multiauth login
Gilles-Philippe Leblanc [Fri, 16 Jan 2015 14:43:10 +0000 (09:43 -0500)]
MDL-48873 auth_cas: Wrong redirection with bad multiauth login

7 years agoMDL-48596 mod_lesson: editing interface won't expand to full screen
Jean-Michel Vedrine [Sun, 28 Dec 2014 09:22:46 +0000 (10:22 +0100)]
MDL-48596 mod_lesson: editing interface won't expand to full screen

7 years agoMDL-43163 mod_lesson: Coding style problem: ->BOX
Jean-Michel Vedrine [Sat, 10 Jan 2015 16:49:07 +0000 (17:49 +0100)]
MDL-43163 mod_lesson: Coding style problem: ->BOX

7 years agoMDL-48837 phpunit: Restore system default timezone
Ray Bon [Wed, 14 Jan 2015 07:05:11 +0000 (15:05 +0800)]
MDL-48837 phpunit: Restore system default timezone

7 years agoMDL-44560 mod_glossary: Fix indentation in mod/glossary/sql.php
John Okely [Fri, 16 Jan 2015 03:48:31 +0000 (11:48 +0800)]
MDL-44560 mod_glossary: Fix indentation in mod/glossary/sql.php

7 years agoMDL-44560 glossary: Fix pagination on glossary category view
John Okely [Thu, 18 Dec 2014 08:48:33 +0000 (16:48 +0800)]
MDL-44560 glossary: Fix pagination on glossary category view

Credit to Sebastian B for this fix

7 years agoMDL-48831 behat: Added behat test for label activity
Rajesh Taneja [Wed, 14 Jan 2015 06:21:59 +0000 (14:21 +0800)]
MDL-48831 behat: Added behat test for label activity

Thanks to Neill Magill, for providing test feature.

7 years agoMDL-48831 behat: Fixed activity show hide for label
Rajesh Taneja [Wed, 14 Jan 2015 06:21:33 +0000 (14:21 +0800)]
MDL-48831 behat: Fixed activity show hide for label

Labels are not links and have dimmed_text class
So updated find query for show/hide activity check

7 years agoMDL-48779 MNet: multibyte substr in certificate generation
Vadim Dvorovenko [Wed, 14 Jan 2015 16:39:14 +0000 (23:39 +0700)]
MDL-48779 MNet: multibyte substr in certificate generation

Using core_text::substr instead of substr for trimming certificate
data. Is needed for sites with long unicode sitename to prevent
breaking line between unicode pair.

7 years agoMDL-48798 Statistics: Adding lang string for user activity.
Vadim Dvorovenko [Wed, 14 Jan 2015 17:07:38 +0000 (00:07 +0700)]
MDL-48798 Statistics: Adding lang string for user activity.

New lang string for 'Activity' (meaning count of user actions) in stats
reports to disambiguate it with 'Activity' (meaning course module).

AMOS BEGIN
 CPY [activity,core],[useractivity,core]
AMOS END

7 years agoMDL-42172 Authentification: Adding alternate names to "Lock user fields"
Vadim Dvorovenko [Wed, 14 Jan 2015 17:49:52 +0000 (00:49 +0700)]
MDL-42172 Authentification: Adding alternate names to "Lock user fields"

Adding alternate name fields (firstnamephonetic, lastnamephonetic,
middlename, alternatename) to "Lock user fields" for all
authentification plugins. This is needed to sync alternate name fields
with external data sources and to lock them for editing.

7 years agoMDL-48741 behat: add new moodle_list formatter (rerun compatible)
Eloy Lafuente (stronk7) [Sun, 4 Jan 2015 12:16:42 +0000 (13:16 +0100)]
MDL-48741 behat: add new moodle_list formatter (rerun compatible)

7 years agoMDL-20053 mod_data: Add userpicture tag to show profile pictures
Anthony Borrow [Fri, 2 Jan 2015 05:52:40 +0000 (13:52 +0800)]
MDL-20053 mod_data: Add userpicture tag to show profile pictures

7 years agoMDL-348 mod_quiz: Improved print layout
Henning Bostelmann [Wed, 10 Dec 2014 19:34:57 +0000 (19:34 +0000)]
MDL-348 mod_quiz: Improved print layout

Implementing a more compact print layout
for question attempt and review pages.

7 years agoMDL-38277 Lesson: Fix strings on activity report
Stephen Bourget [Thu, 15 Jan 2015 17:41:57 +0000 (12:41 -0500)]
MDL-38277 Lesson: Fix strings on activity report

7 years agoMDL-48493 admin: Move the acknowledgement to the plugin validation page
David Mudrák [Fri, 12 Dec 2014 15:46:26 +0000 (16:46 +0100)]
MDL-48493 admin: Move the acknowledgement to the plugin validation page

Previously, the acknowledgement was required only when installing
plugins from the ZIP file. It is valid when installing plugins from the
Plugins directory, too. So we display it at the validator page now to
make sure it is displayed in both cases.

There is no need to require the admin to check the acknowledgement box
now. We do not do that anywhere in admin UI (and there are more
dangerous operations than installing a plugin). Admins still can deploy
plugins manually without this tool anyway. And at the end, they are
admins. They should know what they are doing. Simply displaying the
acknowledgement message before they click the install button is enough.

7 years agoMDL-48493 admin: Add icon to repeat permission check in plugin installer
David Mudrák [Fri, 12 Dec 2014 15:25:06 +0000 (16:25 +0100)]
MDL-48493 admin: Add icon to repeat permission check in plugin installer

7 years agoMDL-48493 admin: Do not require selected plugin type on installation
David Mudrák [Fri, 12 Dec 2014 12:32:50 +0000 (13:32 +0100)]
MDL-48493 admin: Do not require selected plugin type on installation

Now we allow the plugin type left unselected and we attempt to
auto-detect it. Only when the auto-detection fails, the admin has to
manually select the type of the plugin.

7 years agoMDL-48493 admin: Make plugin installer able to detect plugin component
David Mudrák [Fri, 12 Dec 2014 10:19:30 +0000 (11:19 +0100)]
MDL-48493 admin: Make plugin installer able to detect plugin component

On contrary to deeper heuristic (read: guessing) we perform in the
Plugins directory (such as looking at the names of the language files),
here we simply rely on the plugin component being correctly defined in
the version.php file.

The validator class has more robust processing, to make sure the
component declaration is not provided in a commented area of the
version.php etc.  However, as it is fully acceptable that the
auto-detection fails if the version.php uses non-standard syntax, this
easier approach is valid here.

7 years agoMDL-48829 quiz nav: add a data attr to buttons giving the page
Tim Hunt [Tue, 13 Jan 2015 13:55:33 +0000 (13:55 +0000)]
MDL-48829 quiz nav: add a data attr to buttons giving the page

This way, if you need to know which page each button goes to in
JavaScript, you can find out.

7 years agoMDL-48477 questions: no delete icon for only top-level category
Tim Hunt [Mon, 12 Jan 2015 13:18:49 +0000 (13:18 +0000)]
MDL-48477 questions: no delete icon for only top-level category

The back end code already threw an exception if you clicked the icon,
so you could not delete the category, but we should not have shown the
icon in the first place.

Thanks to Pramith Dayananda for working out the fix for this issue. I am
just committing it.

7 years agoMDL-48830 accesslib: Add sort field to query
Michael Aherne [Tue, 13 Jan 2015 14:47:34 +0000 (14:47 +0000)]
MDL-48830 accesslib: Add sort field to query

7 years agoweekly release 2.9dev
Andrew Nicols [Thu, 15 Jan 2015 06:19:36 +0000 (14:19 +0800)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 15 Jan 2015 06:19:22 +0000 (14:19 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMerge branch 'MDL-41674' of git://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 23:34:08 +0000 (00:34 +0100)]
Merge branch 'MDL-41674' of git://github.com/mr-russ/moodle

7 years agoMerge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign
Andrew Nicols [Wed, 14 Jan 2015 00:07:32 +0000 (08:07 +0800)]
Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign

7 years agoMerge branch 'MDL-47761-master' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 23:26:45 +0000 (00:26 +0100)]
Merge branch 'MDL-47761-master' of git://github.com/xow/moodle

7 years agoMerge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com...
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 22:45:20 +0000 (23:45 +0100)]
Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle

7 years agoMerge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 22:22:15 +0000 (23:22 +0100)]
Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-48753_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 13 Jan 2015 14:32:22 +0000 (15:32 +0100)]
Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'MDL-48675' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 14:08:05 +0000 (14:08 +0000)]
Merge branch 'MDL-48675' of git://github.com/jmvedrine/moodle

Conflicts:
mod/lesson/upgrade.txt

7 years agoMerge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 13 Jan 2015 13:14:50 +0000 (13:14 +0000)]
Merge branch 'MDL-36824_m29' of https://github.com/sbourget/moodle

7 years agoMerge branch 'MDL-39103-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 13 Jan 2015 12:49:50 +0000 (12:49 +0000)]
Merge branch 'MDL-39103-master' of git://github.com/xow/moodle

Conflicts:
mod/lesson/lib.php

7 years agoMerge branch 'MDL-45784-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 13 Jan 2015 12:43:05 +0000 (12:43 +0000)]
Merge branch 'MDL-45784-master' of git://github.com/xow/moodle

7 years agoMerge branch 'MDL-47931' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 12:31:22 +0000 (12:31 +0000)]
Merge branch 'MDL-47931' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-48474' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 13 Jan 2015 11:53:37 +0000 (11:53 +0000)]
Merge branch 'MDL-48474' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:58:29 +0000 (10:58 +0000)]
Merge branch 'MDL-48750_m29' of https://github.com/sbourget/moodle

7 years agoMerge branch 'MDL-48729_legacy_log_error' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:26:21 +0000 (10:26 +0000)]
Merge branch 'MDL-48729_legacy_log_error' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-40326' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 10:08:18 +0000 (10:08 +0000)]
Merge branch 'MDL-40326' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-14730' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 13 Jan 2015 09:59:37 +0000 (09:59 +0000)]
Merge branch 'MDL-14730' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-45848-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 13 Jan 2015 08:53:13 +0000 (08:53 +0000)]
Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-48510-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 13 Jan 2015 08:29:07 +0000 (08:29 +0000)]
Merge branch 'MDL-48510-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-48510 inbound: use 0 expiration for private files handler
Ankit Agarwal [Thu, 25 Dec 2014 08:26:19 +0000 (13:56 +0530)]
MDL-48510 inbound: use 0 expiration for private files handler

7 years agoMDL-48510 inbound: Support disabling of expiration changes in UI
Ankit Agarwal [Thu, 25 Dec 2014 06:17:19 +0000 (11:47 +0530)]
MDL-48510 inbound: Support disabling of expiration changes in UI

7 years agoMDL-48510 inbound: Use correct value of expiration
Ankit Agarwal [Thu, 25 Dec 2014 06:16:43 +0000 (11:46 +0530)]
MDL-48510 inbound: Use correct value of expiration

7 years agoMerge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle
Andrew Nicols [Tue, 13 Jan 2015 03:43:43 +0000 (11:43 +0800)]
Merge branch 'MDL-47232_master' of https://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Jan 2015 02:27:43 +0000 (10:27 +0800)]
Merge branch 'MDL-43898-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests
Eloy Lafuente (stronk7) [Mon, 12 Jan 2015 17:17:36 +0000 (18:17 +0100)]
MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests

MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.

This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.

So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.

7 years agoMerge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 12 Jan 2015 15:21:33 +0000 (16:21 +0100)]
Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle