moodle.git
5 years agoMDL-53980 lang: Fix the reworded strings in Behat tests
David Mudrák [Thu, 28 Apr 2016 16:39:59 +0000 (18:39 +0200)]
MDL-53980 lang: Fix the reworded strings in Behat tests

5 years agoMDL-53980 lang: Merge English strings from the en_fix language pack
Helen Foster [Thu, 28 Apr 2016 16:32:03 +0000 (18:32 +0200)]
MDL-53980 lang: Merge English strings from the en_fix language pack

5 years agoon-demand release 3.1dev+
Dan Poltawski [Tue, 26 Apr 2016 08:29:04 +0000 (09:29 +0100)]
on-demand release 3.1dev+

5 years agoMerge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 26 Apr 2016 03:38:00 +0000 (11:38 +0800)]
Merge branch 'MDL-53667-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 26 Apr 2016 03:29:51 +0000 (11:29 +0800)]
Merge branch 'MDL-53632-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 26 Apr 2016 03:11:40 +0000 (11:11 +0800)]
Merge branch 'MDL-52550-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:55:03 +0000 (10:55 +0800)]
Merge branch 'MDL-53733_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:49:32 +0000 (10:49 +0800)]
Merge branch 'MDL-53878_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle
David Monllao [Tue, 26 Apr 2016 02:45:40 +0000 (10:45 +0800)]
Merge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 26 Apr 2016 02:13:24 +0000 (10:13 +0800)]
Merge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)]
Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53717_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:20:31 +0000 (22:20 +0100)]
Merge branch 'MDL-53717_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-53811_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:01:38 +0000 (22:01 +0100)]
Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 25 Apr 2016 21:00:18 +0000 (22:00 +0100)]
Merge branch 'MDL-53853-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 25 Apr 2016 14:53:12 +0000 (15:53 +0100)]
Merge branch 'MDL-53864_master-alt' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-49754-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)]
Merge branch 'MDL-49754-master' of https://github.com/xow/moodle

5 years agoMerge branch 'wip-MDL-47672-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Sun, 24 Apr 2016 13:31:45 +0000 (14:31 +0100)]
Merge branch 'wip-MDL-47672-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-53878 tool_lp: Condition on displaying Link competencies button
Issam Taboubi [Wed, 20 Apr 2016 18:11:35 +0000 (14:11 -0400)]
MDL-53878 tool_lp: Condition on displaying Link competencies button

5 years agoMDL-53733 tool_lp: Competency heading misaligned in templatecompetency
Issam Taboubi [Tue, 12 Apr 2016 20:42:30 +0000 (16:42 -0400)]
MDL-53733 tool_lp: Competency heading misaligned in templatecompetency

5 years agoMDL-53678 tool_lp: Dropdown list plan displays horizontal scroll bar
Issam Taboubi [Thu, 14 Apr 2016 19:09:26 +0000 (15:09 -0400)]
MDL-53678 tool_lp: Dropdown list plan displays horizontal scroll bar

5 years agoweekly release 3.1dev
Eloy Lafuente (stronk7) [Fri, 22 Apr 2016 08:56:57 +0000 (10:56 +0200)]
weekly release 3.1dev

5 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Fri, 22 Apr 2016 08:56:57 +0000 (10:56 +0200)]
NOBUG: Fixed file access permissions

5 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Fri, 22 Apr 2016 08:56:53 +0000 (10:56 +0200)]
NOBUG: Fixed SVG browser compatibility

5 years agoMerge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Fri, 22 Apr 2016 06:25:03 +0000 (14:25 +0800)]
Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle

5 years agoMDL-52781 core_user: remove invalid countries from unit tests
Simey Lameze [Fri, 22 Apr 2016 06:10:55 +0000 (14:10 +0800)]
MDL-52781 core_user: remove invalid countries from unit tests

5 years agoMerge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Fri, 22 Apr 2016 05:23:16 +0000 (13:23 +0800)]
Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle

5 years agoMDL-52781 core_user: fix wrong lang check
Simey Lameze [Fri, 22 Apr 2016 05:00:21 +0000 (13:00 +0800)]
MDL-52781 core_user: fix wrong lang check

5 years agoMerge branch 'MDL-53451-master-fixup3' of https://github.com/FMCorz/moodle
David Monllao [Fri, 22 Apr 2016 04:59:59 +0000 (12:59 +0800)]
Merge branch 'MDL-53451-master-fixup3' of https://github.com/FMCorz/moodle

5 years agoMDL-53451 competency: Improve performance by bypassing api::is_enabled()
Frederic Massart [Fri, 22 Apr 2016 03:34:39 +0000 (11:34 +0800)]
MDL-53451 competency: Improve performance by bypassing api::is_enabled()

5 years agoMDL-52490 mod_assign: fix lang strings to make it consistent
Simey Lameze [Fri, 22 Apr 2016 02:25:07 +0000 (10:25 +0800)]
MDL-52490 mod_assign: fix lang strings to make it consistent

5 years agoMerge branch 'MDL-46092' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 21 Apr 2016 12:21:03 +0000 (13:21 +0100)]
Merge branch 'MDL-46092' of git://github.com/timhunt/moodle

5 years agoMDL-46092 quiz nav: fix buttons in requiresgrading state
Tim Hunt [Thu, 21 Apr 2016 11:25:45 +0000 (12:25 +0100)]
MDL-46092 quiz nav: fix buttons in requiresgrading state

5 years agoMerge branch 'MDL-51603-fixes' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 21 Apr 2016 08:24:28 +0000 (09:24 +0100)]
Merge branch 'MDL-51603-fixes' of git://github.com/dmonllao/moodle

5 years agoMDL-51603 dataformat_ods: Setting the sheet name
David Monllao [Thu, 21 Apr 2016 07:57:22 +0000 (15:57 +0800)]
MDL-51603 dataformat_ods: Setting the sheet name

Clearning according to Box\Spout\Writer\Common\Sheet::isNameValid

5 years agoMDL-51603 dataformats: Using the long name instead of the short one
David Monllao [Thu, 21 Apr 2016 06:48:01 +0000 (14:48 +0800)]
MDL-51603 dataformats: Using the long name instead of the short one

5 years agoMDL-51603 quiz statistics: Using dataformats selector
David Monllao [Thu, 21 Apr 2016 06:47:34 +0000 (14:47 +0800)]
MDL-51603 quiz statistics: Using dataformats selector

5 years agoMDL-51603 dataformats: coding_exception if output buffering
David Monllao [Thu, 21 Apr 2016 06:47:09 +0000 (14:47 +0800)]
MDL-51603 dataformats: coding_exception if output buffering

5 years agoMDL-51603 dataformat: Fixed worksheet title bug
Brendan Heywood [Wed, 20 Apr 2016 23:25:28 +0000 (09:25 +1000)]
MDL-51603 dataformat: Fixed worksheet title bug

5 years agoMerge branch 'MDL-52781-master' of git://github.com/lameze/moodle
Andrew Nicols [Thu, 21 Apr 2016 07:43:35 +0000 (15:43 +0800)]
Merge branch 'MDL-52781-master' of git://github.com/lameze/moodle

5 years agoMDL-52781 tool_uploaduser: add invalid data warnings if validation fails
Simey Lameze [Thu, 21 Apr 2016 05:05:12 +0000 (13:05 +0800)]
MDL-52781 tool_uploaduser: add invalid data warnings if validation fails

5 years agoMDL-52781 auth_db: deprecate clean_data method.
Simey Lameze [Mon, 18 Apr 2016 01:02:41 +0000 (09:02 +0800)]
MDL-52781 auth_db: deprecate clean_data method.

    The old clean_data method has been deprecated as the user_create_user and user_updated user
    will be responsible by validating the user data.

5 years agoMDL-52781 core_user: replace direct PARAM_ usages.
Simey Lameze [Mon, 11 Apr 2016 04:16:09 +0000 (12:16 +0800)]
MDL-52781 core_user: replace direct PARAM_ usages.

This commit replace as much as possible of clean_param and PARAM_ usages related to user object.
Also few unit tests has been changed to match the new validation

5 years agoMDL-52781 core_user: add validation to user insertion and updating method
Simey Lameze [Mon, 11 Apr 2016 04:11:40 +0000 (12:11 +0800)]
MDL-52781 core_user: add validation to user insertion and updating method

The new validation were added to user_create_user and user_update_user,
displaying debug message if some invalid data has been found.
Also the unit tests of those methods has been changed to match the methods behaviour.

5 years agoMDL-52781 core_user: improve core_user::fill_properties_cache()
Simey Lameze [Mon, 11 Apr 2016 04:08:47 +0000 (12:08 +0800)]
MDL-52781 core_user: improve core_user::fill_properties_cache()

5 years agoMDL-52550 atto: Added preventDefaults for events dragover and dragenter
Panagiotis Nikoloutsopoulos [Mon, 14 Mar 2016 02:35:02 +0000 (02:35 +0000)]
MDL-52550 atto: Added preventDefaults for events dragover and dragenter

5 years agoMDL-53451 tool_lpmigrate: Keep course competency on module failure
Frederic Massart [Thu, 21 Apr 2016 03:37:27 +0000 (11:37 +0800)]
MDL-53451 tool_lpmigrate: Keep course competency on module failure

When permissions are lacking and the course module competencies could
not be migrated we must keep the course competency to preserve the
original competency in the course module.

5 years agoMDL-53864 mod_feedback: fixed varying results on MSSQL
Mark Nelson [Thu, 21 Apr 2016 03:22:24 +0000 (11:22 +0800)]
MDL-53864 mod_feedback: fixed varying results on MSSQL

5 years agoMerge branch 'MDL-46092' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 20 Apr 2016 21:19:27 +0000 (22:19 +0100)]
Merge branch 'MDL-46092' of git://github.com/timhunt/moodle

5 years agoMDL-46092 bootstrapbase: add OU quiz styling
Tim Hunt [Sun, 17 Apr 2016 22:28:25 +0000 (23:28 +0100)]
MDL-46092 bootstrapbase: add OU quiz styling

It is a nicer default to have in Moodle that what we had before.

5 years agoMerge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 20 Apr 2016 12:30:38 +0000 (13:30 +0100)]
Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Wed, 20 Apr 2016 11:38:15 +0000 (12:38 +0100)]
Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-53095-master' of git://github.com/lameze/moodle
Dan Poltawski [Wed, 20 Apr 2016 10:49:50 +0000 (11:49 +0100)]
Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 20 Apr 2016 10:28:55 +0000 (11:28 +0100)]
Merge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle

5 years agoMerge branch 'wip-MDL-53798-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 20 Apr 2016 10:09:48 +0000 (11:09 +0100)]
Merge branch 'wip-MDL-53798-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-53451 tool_lpmigrate: Fixing broken logic found in tests
Frederic Massart [Wed, 20 Apr 2016 09:52:09 +0000 (17:52 +0800)]
MDL-53451 tool_lpmigrate: Fixing broken logic found in tests

Thanks to MSSQL, the only one with failures.

5 years agoMerge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle
Dan Poltawski [Wed, 20 Apr 2016 09:33:23 +0000 (10:33 +0100)]
Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle

5 years agoMerge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 20 Apr 2016 09:27:57 +0000 (10:27 +0100)]
Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-53599' of git://github.com/nhoobin/moodle
David Monllao [Wed, 20 Apr 2016 08:38:57 +0000 (16:38 +0800)]
Merge branch 'MDL-53599' of git://github.com/nhoobin/moodle

5 years agoMerge branch 'MDL-53757_master' of git://github.com/markn86/moodle
David Monllao [Wed, 20 Apr 2016 07:52:57 +0000 (15:52 +0800)]
Merge branch 'MDL-53757_master' of git://github.com/markn86/moodle

5 years agoMDL-53451 competency: Hook for scale_used used undefined variable
Frederic Massart [Wed, 20 Apr 2016 07:17:40 +0000 (15:17 +0800)]
MDL-53451 competency: Hook for scale_used used undefined variable

5 years agoMDL-53451 competency: Fixing database errors on Oracle
Frederic Massart [Wed, 20 Apr 2016 07:16:16 +0000 (15:16 +0800)]
MDL-53451 competency: Fixing database errors on Oracle

- Random ordering caused by absence of ORDER BY clause
- Invalid query statemennt due to wrong string concatenation
- Cannot GROUP BY with CLOB columns

5 years agoMerge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com...
Andrew Nicols [Wed, 20 Apr 2016 06:45:44 +0000 (14:45 +0800)]
Merge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com/brendanheywood/moodle

5 years agoMDL-51603 dataformat: Removing subsystem from the list
David Monllao [Wed, 20 Apr 2016 06:40:47 +0000 (14:40 +0800)]
MDL-51603 dataformat: Removing subsystem from the list

5 years agoMerge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle
David Monllao [Wed, 20 Apr 2016 04:37:05 +0000 (12:37 +0800)]
Merge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle

Conflicts:
lib/tests/component_test.php

5 years agoMerge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 20 Apr 2016 04:24:07 +0000 (12:24 +0800)]
Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-48506_master' of git://github.com/markn86/moodle
David Monllao [Wed, 20 Apr 2016 03:54:38 +0000 (11:54 +0800)]
Merge branch 'MDL-48506_master' of git://github.com/markn86/moodle

5 years agoMDL-53757 core_calendar: always show whole day's events in 'day' view
Nick Phillips [Sun, 10 Apr 2016 20:46:02 +0000 (08:46 +1200)]
MDL-53757 core_calendar: always show whole day's events in 'day' view

5 years agoMerge branch 'MDL-53382' of https://github.com/andrewhancox/moodle
David Monllao [Wed, 20 Apr 2016 03:29:57 +0000 (11:29 +0800)]
Merge branch 'MDL-53382' of https://github.com/andrewhancox/moodle

5 years agoMerge branch 'MDL-53702_master' of https://github.com/liorgil/moodle
David Monllao [Wed, 20 Apr 2016 03:10:23 +0000 (11:10 +0800)]
Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle

5 years agoMerge branch 'MDL-25742-fix-individual-wiki' of git://github.com/cameron1729/moodle
David Monllao [Wed, 20 Apr 2016 03:07:23 +0000 (11:07 +0800)]
Merge branch 'MDL-25742-fix-individual-wiki' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-52596-assign-maxperpage' of https://github.com/brendanheywood/moodle
David Monllao [Wed, 20 Apr 2016 03:04:10 +0000 (11:04 +0800)]
Merge branch 'MDL-52596-assign-maxperpage' of https://github.com/brendanheywood/moodle

5 years agoMDL-34925 user: Convert bulk user download to dataformat
Brendan Heywood [Tue, 22 Mar 2016 13:25:40 +0000 (00:25 +1100)]
MDL-34925 user: Convert bulk user download to dataformat

5 years agoMerge branch 'MDL-53799-31' of https://github.com/vadimonus/moodle
David Monllao [Wed, 20 Apr 2016 02:59:49 +0000 (10:59 +0800)]
Merge branch 'MDL-53799-31' of https://github.com/vadimonus/moodle

5 years agoMDL-51603 report_log: Allow streaming downloads
Brendan Heywood [Mon, 11 Apr 2016 04:18:18 +0000 (14:18 +1000)]
MDL-51603 report_log: Allow streaming downloads

5 years agoMDL-51603 tablelib: Removed legacy export classes
Brendan Heywood [Tue, 19 Apr 2016 13:31:58 +0000 (23:31 +1000)]
MDL-51603 tablelib: Removed legacy export classes

5 years agoMDL-51603 tablelib: Delegate to dataformat for downloading
Brendan Heywood [Mon, 11 Apr 2016 04:17:43 +0000 (14:17 +1000)]
MDL-51603 tablelib: Delegate to dataformat for downloading

5 years agoMDL-51603 dataformat: Implement streaming dataformat plugin
Brendan Heywood [Sat, 2 Apr 2016 05:10:29 +0000 (16:10 +1100)]
MDL-51603 dataformat: Implement streaming dataformat plugin

5 years agoMDL-25742 mod_wiki: Fix bug in get_tagged_pages
Cameron Ball [Wed, 20 Apr 2016 02:37:34 +0000 (10:37 +0800)]
MDL-25742 mod_wiki: Fix bug in get_tagged_pages

5 years agoMDL-51603 dataformat: Imported 3rd party lib spout
Brendan Heywood [Sat, 2 Apr 2016 05:10:53 +0000 (16:10 +1100)]
MDL-51603 dataformat: Imported 3rd party lib spout

5 years agoMerge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Apr 2016 23:19:58 +0000 (01:19 +0200)]
Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-53043' of https://github.com/andrewhancox/moodle
Eloy Lafuente (stronk7) [Tue, 19 Apr 2016 22:53:07 +0000 (00:53 +0200)]
Merge branch 'MDL-53043' of https://github.com/andrewhancox/moodle

5 years agoMDL-48506 cachestore_memcached: make warning more noticeable
Mark Nelson [Tue, 19 Apr 2016 09:11:05 +0000 (17:11 +0800)]
MDL-48506 cachestore_memcached: make warning more noticeable

5 years agoMerge branch 'MDL-49279-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 19 Apr 2016 08:55:01 +0000 (16:55 +0800)]
Merge branch 'MDL-49279-master' of git://github.com/jleyva/moodle

Conflicts:
lib/classes/plugin_manager.php

5 years agoMDL-51267 mod: move the changes from the API to the form file
Simey Lameze [Tue, 19 Apr 2016 08:13:19 +0000 (16:13 +0800)]
MDL-51267 mod: move the changes from the API to the form file

5 years agoMDL-49279 mobile: Support export of mobile addons in plugins
Juan Leyva [Wed, 30 Mar 2016 12:35:17 +0000 (13:35 +0100)]
MDL-49279 mobile: Support export of mobile addons in plugins

5 years agoMDL-53865 tool_lp: Add maxlength attr and validation for input fields
Jun Pataleta [Tue, 19 Apr 2016 07:39:31 +0000 (15:39 +0800)]
MDL-53865 tool_lp: Add maxlength attr and validation for input fields

5 years agoMDL-53451 tool_lp: Removing unnecessary built modules
David Monllao [Tue, 19 Apr 2016 05:37:49 +0000 (13:37 +0800)]
MDL-53451 tool_lp: Removing unnecessary built modules

5 years agoMDL-53853 tool_lp: Remove competency description in autocomplete
Jun Pataleta [Tue, 19 Apr 2016 05:16:17 +0000 (13:16 +0800)]
MDL-53853 tool_lp: Remove competency description in autocomplete

5 years agoMDL-53811 mod_assign: fixed error in convert submissions task
Mark Nelson [Tue, 19 Apr 2016 04:59:39 +0000 (12:59 +0800)]
MDL-53811 mod_assign: fixed error in convert submissions task

5 years agoMerge branch 'wip-MDL-25742-master' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 19 Apr 2016 04:42:21 +0000 (12:42 +0800)]
Merge branch 'wip-MDL-25742-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'cbe' of git://github.com/FMCorz/moodle
David Monllao [Tue, 19 Apr 2016 04:37:11 +0000 (12:37 +0800)]
Merge branch 'cbe' of git://github.com/FMCorz/moodle

5 years agoMDL-53451 competency: Removing sneaky whitespaces
Frederic Massart [Tue, 19 Apr 2016 04:15:38 +0000 (12:15 +0800)]
MDL-53451 competency: Removing sneaky whitespaces

5 years agoMerge branch 'MDL-51267-master' of git://github.com/lameze/moodle
David Monllao [Tue, 19 Apr 2016 03:53:22 +0000 (11:53 +0800)]
Merge branch 'MDL-51267-master' of git://github.com/lameze/moodle

5 years agoMDL-51267 mod_url: make the url and resource forms friendlier
Simey Lameze [Mon, 11 Apr 2016 06:30:09 +0000 (14:30 +0800)]
MDL-51267 mod_url: make the url and resource forms friendlier

5 years agoMDL-53451 competency: Properly wrap those nasty function declarations
Frederic Massart [Tue, 19 Apr 2016 02:55:46 +0000 (10:55 +0800)]
MDL-53451 competency: Properly wrap those nasty function declarations

Pheww, we avoided a disaster.

5 years agoMerge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 19 Apr 2016 02:32:56 +0000 (10:32 +0800)]
Merge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 19 Apr 2016 02:05:17 +0000 (10:05 +0800)]
Merge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-53535_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 19 Apr 2016 01:45:30 +0000 (09:45 +0800)]
Merge branch 'MDL-53535_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)]
Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 18 Apr 2016 23:44:46 +0000 (01:44 +0200)]
Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle