moodle.git
6 years agoMerge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 May 2016 08:15:03 +0000 (16:15 +0800)]
Merge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-54177_master' of git://github.com/markn86/moodle
David Monllao [Mon, 16 May 2016 07:25:52 +0000 (15:25 +0800)]
Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle
David Monllao [Mon, 16 May 2016 06:39:43 +0000 (14:39 +0800)]
Merge branch 'MDL-53311-master-moregooderer' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-54566_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 16 May 2016 06:27:06 +0000 (14:27 +0800)]
Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle

6 years agoMDL-54566 tool_lp: added message when no competencies present
Mark Nelson [Fri, 13 May 2016 08:26:10 +0000 (16:26 +0800)]
MDL-54566 tool_lp: added message when no competencies present

6 years agoMDL-54177 enrol_lti: improved lang strings
Mark Nelson [Fri, 13 May 2016 03:29:57 +0000 (11:29 +0800)]
MDL-54177 enrol_lti: improved lang strings

Also removed unused strings.

6 years agoMerge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle
Andrew Nicols [Mon, 16 May 2016 05:06:05 +0000 (13:06 +0800)]
Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle

6 years agoMDL-53221 search: Renaming search areas
David Monllao [Fri, 13 May 2016 12:10:16 +0000 (20:10 +0800)]
MDL-53221 search: Renaming search areas

AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END

6 years agoMerge branch 'MDL-54117-master' of https://github.com/barbararamiro/moodle
David Monllao [Mon, 16 May 2016 04:50:13 +0000 (12:50 +0800)]
Merge branch 'MDL-54117-master' of https://github.com/barbararamiro/moodle

6 years agoMerge branch 'MDL-54550_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 16 May 2016 04:21:20 +0000 (12:21 +0800)]
Merge branch 'MDL-54550_master' of git://github.com/markn86/moodle

6 years agoMDL-54550 enrol_lti: show plugin description and warning
Mark Nelson [Thu, 12 May 2016 09:11:08 +0000 (17:11 +0800)]
MDL-54550 enrol_lti: show plugin description and warning

- Updated and added plugin description to the settings page.
- Added warning when the auth_lti plugin is not enabled.
- Moved existing 'Allow frame embedding' warning above the
  'User default values' heading.

6 years agoMerge branch 'MDL-54560_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 16 May 2016 04:11:19 +0000 (12:11 +0800)]
Merge branch 'MDL-54560_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 16 May 2016 04:05:34 +0000 (12:05 +0800)]
Merge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle
David Monllao [Mon, 16 May 2016 04:03:07 +0000 (12:03 +0800)]
Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle
David Monllao [Mon, 16 May 2016 04:01:37 +0000 (12:01 +0800)]
Merge branch 'MDL-54131_m31v3' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle
Andrew Nicols [Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)]
Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle

6 years agoMerge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 May 2016 03:52:02 +0000 (11:52 +0800)]
Merge branch 'MDL-54026-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle
David Monllao [Mon, 16 May 2016 03:31:41 +0000 (11:31 +0800)]
Merge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle

6 years agoMDL-54584 repository: Set a default filename in prepare_file
Andrew Nicols [Mon, 16 May 2016 03:07:38 +0000 (11:07 +0800)]
MDL-54584 repository: Set a default filename in prepare_file

6 years agoMDL-52815 theme: group select overlapping issue
vpisabeywardana [Thu, 17 Mar 2016 16:00:19 +0000 (21:30 +0530)]
MDL-52815 theme: group select overlapping issue

Gave minimum width for select tags which are under 'groups' and 'members' classes

6 years agoMDL-54560 search: Search box aligned with .usermenu on .navbar
David Monllao [Mon, 16 May 2016 02:38:14 +0000 (10:38 +0800)]
MDL-54560 search: Search box aligned with .usermenu on .navbar

6 years agoMDL-54560 search: Fix menu item to be correct height
Eric Merrill [Thu, 12 May 2016 18:27:45 +0000 (14:27 -0400)]
MDL-54560 search: Fix menu item to be correct height

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMDL-54128 mod_lti: Add help for custom LTI tools in activity picker
Jake Dallimore [Fri, 13 May 2016 06:28:07 +0000 (14:28 +0800)]
MDL-54128 mod_lti: Add help for custom LTI tools in activity picker

6 years agoMDL-54588 behat: Button has been replaced with link
Rajesh Taneja [Mon, 16 May 2016 01:13:29 +0000 (09:13 +0800)]
MDL-54588 behat: Button has been replaced with link

Adding a scale has been modified to use link
on outcome page

6 years agoMDL-54131 Behat: tests for the course list block
Stephen Bourget [Sat, 14 May 2016 02:05:33 +0000 (22:05 -0400)]
MDL-54131 Behat: tests for the course list block

6 years agoMDL-54133 Behat: tests for the course overview block
Stephen Bourget [Sat, 14 May 2016 01:40:34 +0000 (21:40 -0400)]
MDL-54133 Behat: tests for the course overview block

6 years agoon-demand release 3.1beta+
David Monllao [Fri, 13 May 2016 10:33:23 +0000 (18:33 +0800)]
on-demand release 3.1beta+

6 years agoNOBUG: Fixed SVG browser compatibility
David Monllao [Fri, 13 May 2016 10:33:22 +0000 (18:33 +0800)]
NOBUG: Fixed SVG browser compatibility

6 years agoNOBUG: ensure build number doesn't go backwards
David Monllao [Fri, 13 May 2016 10:16:30 +0000 (18:16 +0800)]
NOBUG: ensure build number doesn't go backwards

(Due to reverts happening in MDL-45390 and MDL-52815)

6 years agoMerge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 13 May 2016 06:45:24 +0000 (14:45 +0800)]
Merge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Fri, 13 May 2016 05:34:45 +0000 (13:34 +0800)]
Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-54073 tool_lp: Unescape additional properties
Jun Pataleta [Fri, 13 May 2016 06:06:06 +0000 (14:06 +0800)]
MDL-54073 tool_lp: Unescape additional properties

* LP Blocks (Competency name)
* User evidence competency picker (User learning plan name)
* Template competencies (Course full name)

6 years agoMerge branch 'MDL-50063' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 13 May 2016 04:24:28 +0000 (12:24 +0800)]
Merge branch 'MDL-50063' of git://github.com/stronk7/moodle

6 years agoMDL-52253 scales: Correct doc
Andrew Nicols [Fri, 13 May 2016 04:13:35 +0000 (12:13 +0800)]
MDL-52253 scales: Correct doc

6 years agoMDL-52253 scales: Prevent deletion of the last global scale
Damyon Wiese [Tue, 10 May 2016 08:26:08 +0000 (16:26 +0800)]
MDL-52253 scales: Prevent deletion of the last global scale

6 years agoMDL-52253 scales: Add new competence scale
Damyon Wiese [Tue, 10 May 2016 08:15:28 +0000 (16:15 +0800)]
MDL-52253 scales: Add new competence scale

6 years agoMDL-52253 scales: Install the separate and connected scale
Damyon Wiese [Mon, 9 May 2016 05:51:40 +0000 (13:51 +0800)]
MDL-52253 scales: Install the separate and connected scale

6 years agoMerge branch 'MDL-54101_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 12 May 2016 13:04:55 +0000 (14:04 +0100)]
Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Thu, 12 May 2016 12:58:08 +0000 (13:58 +0100)]
Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 12 May 2016 12:33:18 +0000 (13:33 +0100)]
Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Thu, 12 May 2016 05:35:53 +0000 (13:35 +0800)]
Merge branch 'MDL-54073-master' of git://github.com/junpataleta/moodle

6 years agoMDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature
Barbara Ramiro [Mon, 9 May 2016 05:56:44 +0000 (13:56 +0800)]
MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature

6 years agoMerge branch 'MDL-53822-master' of git://github.com/damyon/moodle
David Monllao [Thu, 12 May 2016 00:44:19 +0000 (08:44 +0800)]
Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle
David Monllao [Wed, 11 May 2016 23:37:35 +0000 (07:37 +0800)]
Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle

6 years agoMDL-53311 behat: Update behat navigation steps
Cameron Ball [Thu, 28 Apr 2016 07:43:48 +0000 (15:43 +0800)]
MDL-53311 behat: Update behat navigation steps

6 years agoMDL-53311 block_settings: Update renderer
Cameron Ball [Thu, 28 Apr 2016 07:41:31 +0000 (15:41 +0800)]
MDL-53311 block_settings: Update renderer

The renderer and styles require changes to match the new behaviour
introduced by the modifications to tree.js and the JavaScript renderer.

The PHP renderer now closely matches the JavaScript one, and we now use
the aria-hidden attribute to determine the node state.

6 years agoMDL-53311 block_navigation: Update renderer
Cameron Ball [Thu, 28 Apr 2016 07:41:20 +0000 (15:41 +0800)]
MDL-53311 block_navigation: Update renderer

The renderer and styles require changes to match the new behaviour
introduced by the modifications to tree.js and the JavaScript renderer.

The PHP renderer now closely matches the JavaScript one, and we now use
the aria-hidden attribute to determine the node state.

6 years agoMDL-53311 navigation: Move treeitem role on to p
Cameron Ball [Thu, 28 Apr 2016 07:36:55 +0000 (15:36 +0800)]
MDL-53311 navigation: Move treeitem role on to p

Previously the li elements had the treeitem role, which was not invalid,
but it meant that when a menu item expanded, the entire li was clickable
and clicking anywhere that was not another menu item would cause the
(sub)tree to collapse. This patch moves the treeitem role on to the p
element (which contains the node name) and uses aria-owns to expand

Mad shoutouts to Ryan Wyllie for his assistance 🙌

🌄 ᚳᚱᛒ

6 years agoMDL-54117 design: Simple loading icon
Barbara Ramiro [Fri, 13 May 2016 06:48:23 +0000 (14:48 +0800)]
MDL-54117 design: Simple loading icon

6 years agoMDL-54561 phpunit: only search with first 3 chars
Rajesh Taneja [Fri, 13 May 2016 05:16:31 +0000 (13:16 +0800)]
MDL-54561 phpunit: only search with first 3 chars

Windows uses only the first three characters of prefix in
tempnam(), so only use first 3 chars to find if error
is logged

6 years agoMDL-54130 Behat: Add tests for Completion Status block
Stephen Bourget [Fri, 13 May 2016 01:15:55 +0000 (21:15 -0400)]
MDL-54130 Behat: Add tests for Completion Status block

6 years agoMDL-50063 unittests: Remove some unnecesary gc_collect_cycles()
Eloy Lafuente (stronk7) [Fri, 13 May 2016 00:50:45 +0000 (02:50 +0200)]
MDL-50063 unittests: Remove some unnecesary gc_collect_cycles()

Now backup and restore operations free logger resources calling
to the destroy() method. This commit ensures:

1) That gc_collect_cycles() is not used anymore in backup-related tests.
2) That all backup and restore controllers in test do always call
   to the detroy() method.
3) Some unset() calls, needed to make gc_collect_cycles() are not used
   anymore.

6 years agoMDL-54205 tests: verify destroy() and close() behavior
Eloy Lafuente (stronk7) [Thu, 12 May 2016 23:46:48 +0000 (01:46 +0200)]
MDL-54205 tests: verify destroy() and close() behavior

6 years agoMDL-54205 tool_recyclebin: Adding missing destroy() calls.
Eloy Lafuente (stronk7) [Thu, 12 May 2016 20:55:34 +0000 (22:55 +0200)]
MDL-54205 tool_recyclebin: Adding missing destroy() calls.

This was causing controller references not cleaned till gc
and loggers to remain open, leading to problems under windows.

6 years agoMDL-54205 backup: loggers close() and destroy()
Eloy Lafuente (stronk7) [Wed, 11 May 2016 21:57:54 +0000 (23:57 +0200)]
MDL-54205 backup: loggers close() and destroy()

Any backup & restore operation may be leaving opened files
if a file logger is being used. This implementes the close()
method, so every logger can close any resource.

Also, the recommended backup_controlled::destroy() method
now calls to new logger::destroy() method in charge of
deleting all the references and closing any resource.

Finally, some internally used controllers, were missing
their destroy call, leading to associated loggers to
remain open. Now all them are explicitly deltroyed.

6 years agoMDL-54546 tool_lp: Use correct property types for user/course exporters
Jun Pataleta [Thu, 12 May 2016 05:50:46 +0000 (13:50 +0800)]
MDL-54546 tool_lp: Use correct property types for user/course exporters

6 years agoMDL-54101 core: fixed core/str get_string caching issue
Mark Nelson [Thu, 12 May 2016 06:28:44 +0000 (14:28 +0800)]
MDL-54101 core: fixed core/str get_string caching issue

6 years agoMDL-54543 behat: Increase file download range
Rajesh Taneja [Thu, 12 May 2016 07:48:13 +0000 (15:48 +0800)]
MDL-54543 behat: Increase file download range

with different db's, the id and defaultgrade
might be different, so increasing the range
to avoid such failures

6 years agoMDL-54073 tool_lp: Unescape PARAM_TEXT properties in templates
Jun Pataleta [Fri, 6 May 2016 07:52:45 +0000 (15:52 +0800)]
MDL-54073 tool_lp: Unescape PARAM_TEXT properties in templates

Use triple-curly brackets to unescape the PARAM_TEXT properties in
templates.
Changed idnumber's type to PARAM_RAW for frameworks and competencies.

6 years agoMerge branch 'MDL-53170_levels-fix' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 11 May 2016 09:54:01 +0000 (11:54 +0200)]
Merge branch 'MDL-53170_levels-fix' of git://github.com/dmonllao/moodle

6 years agoMDL-53170 search: Specify core_course mycourses search level
David Monllao [Wed, 11 May 2016 09:22:24 +0000 (17:22 +0800)]
MDL-53170 search: Specify core_course mycourses search level

6 years agoMerge branch 'MDL-54103_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 11 May 2016 09:04:07 +0000 (10:04 +0100)]
Merge branch 'MDL-54103_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 11 May 2016 09:00:50 +0000 (10:00 +0100)]
Merge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-54056-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 11 May 2016 07:39:26 +0000 (15:39 +0800)]
Merge branch 'MDL-54056-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'MDL-54055-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 11 May 2016 07:00:39 +0000 (15:00 +0800)]
Merge branch 'MDL-54055-master' of git://github.com/junpataleta/moodle

6 years agoMDL-53822 editpdf: Show different cursors for select and move
Damyon Wiese [Wed, 11 May 2016 06:54:38 +0000 (14:54 +0800)]
MDL-53822 editpdf: Show different cursors for select and move

6 years agoMerge branch 'MDL-54125_master' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 11 May 2016 06:11:07 +0000 (14:11 +0800)]
Merge branch 'MDL-54125_master' of git://github.com/markn86/moodle

6 years agoMDL-54055 gradingform_guide: Skip insertion of empty comments
Jun Pataleta [Thu, 5 May 2016 01:49:16 +0000 (09:49 +0800)]
MDL-54055 gradingform_guide: Skip insertion of empty comments

We should not be adding empty entries for the frequently-used comments.

6 years agoMDL-54125 mod_data: fixed PHP notice
Mark Nelson [Tue, 10 May 2016 09:09:37 +0000 (17:09 +0800)]
MDL-54125 mod_data: fixed PHP notice

Also removed unused variables.

6 years agoMerge branch 'MDL-53976-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 11 May 2016 04:05:43 +0000 (12:05 +0800)]
Merge branch 'MDL-53976-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-53580-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Wed, 11 May 2016 03:29:57 +0000 (11:29 +0800)]
Merge branch 'MDL-53580-master' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Wed, 11 May 2016 03:22:37 +0000 (11:22 +0800)]
Merge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-52800-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 11 May 2016 03:08:55 +0000 (11:08 +0800)]
Merge branch 'MDL-52800-master' of git://github.com/ryanwyllie/moodle

6 years agoMDL-54074 core_tag: False negative on Oracle due to random ordering
Frederic Massart [Tue, 10 May 2016 03:39:45 +0000 (11:39 +0800)]
MDL-54074 core_tag: False negative on Oracle due to random ordering

6 years agoMDL-54110 repositories: Whitespace, Typo + unit test fixes
Andrew Nicols [Wed, 11 May 2016 02:24:47 +0000 (10:24 +0800)]
MDL-54110 repositories: Whitespace, Typo + unit test fixes

6 years agoMerge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle
Andrew Nicols [Wed, 11 May 2016 02:10:57 +0000 (10:10 +0800)]
Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle

6 years agoMerge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle
David Monllao [Wed, 11 May 2016 01:09:11 +0000 (09:09 +0800)]
Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle

6 years agoMDL-53293 tool_lp: Destroy dragdrop instance before re-creating
Andrew Nicols [Tue, 10 May 2016 07:27:46 +0000 (15:27 +0800)]
MDL-53293 tool_lp: Destroy dragdrop instance before re-creating

6 years agoMDL-53293 core: Add destructor phases to core-dragdrop
Andrew Nicols [Tue, 10 May 2016 07:27:08 +0000 (15:27 +0800)]
MDL-53293 core: Add destructor phases to core-dragdrop

6 years agoMerge branch 'MDL-53170_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 10 May 2016 16:54:57 +0000 (18:54 +0200)]
Merge branch 'MDL-53170_master' of git://github.com/dmonllao/moodle

6 years agoMDL-54075 competency: False negatives due to random ordering and latency
Frederic Massart [Mon, 9 May 2016 10:59:42 +0000 (18:59 +0800)]
MDL-54075 competency: False negatives due to random ordering and latency

6 years agoMDL-54110 repositories: Allow repositories to ignore post_max_size
Mark Johnson [Tue, 10 May 2016 14:35:43 +0000 (15:35 +0100)]
MDL-54110 repositories: Allow repositories to ignore post_max_size

Repositories can now override usespost() if they don't upload using POST
requests. This restores the ability of users with
moodle/course:ignorefilesizelimits to upload files of unlimited size
lost in MDL-44626.

6 years agoMDL-53580 auth_ldap: Set default value for suspended_attribute
Cameron Ball [Tue, 10 May 2016 15:04:46 +0000 (23:04 +0800)]
MDL-53580 auth_ldap: Set default value for suspended_attribute

It was also necessary to cast some boolean values to ints as a
workaround for moodle's broken boolean validation.

6 years agoMerge branch 'MDL-50704-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 10 May 2016 14:59:41 +0000 (15:59 +0100)]
Merge branch 'MDL-50704-master' of git://github.com/FMCorz/moodle

6 years agoMDL-53916 mod_assign: Point update grade link to new interface
Cameron Ball [Fri, 6 May 2016 08:20:53 +0000 (16:20 +0800)]
MDL-53916 mod_assign: Point update grade link to new interface

6 years agoMerge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 10 May 2016 13:58:41 +0000 (21:58 +0800)]
Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 10 May 2016 13:41:15 +0000 (21:41 +0800)]
Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-54120' of git://github.com/aolley/moodle
David Monllao [Tue, 10 May 2016 13:38:30 +0000 (21:38 +0800)]
Merge branch 'MDL-54120' of git://github.com/aolley/moodle

6 years agoon-demand release 3.1beta+
David Monllao [Tue, 10 May 2016 10:55:50 +0000 (18:55 +0800)]
on-demand release 3.1beta+

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Tue, 10 May 2016 10:55:48 +0000 (18:55 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-54102_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 10 May 2016 07:40:45 +0000 (15:40 +0800)]
Merge branch 'MDL-54102_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 10 May 2016 04:06:36 +0000 (12:06 +0800)]
Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle

6 years agoMDL-54004 behat: Whitespace fixes
Andrew Nicols [Tue, 10 May 2016 04:02:43 +0000 (12:02 +0800)]
MDL-54004 behat: Whitespace fixes

6 years agoMerge branch 'MDL-54004_m31v2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 10 May 2016 03:28:24 +0000 (11:28 +0800)]
Merge branch 'MDL-54004_m31v2' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 10 May 2016 02:32:15 +0000 (10:32 +0800)]
Merge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-52506-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 10 May 2016 02:05:20 +0000 (10:05 +0800)]
Merge branch 'MDL-52506-master' of git://github.com/ryanwyllie/moodle

6 years agoMDL-53170 search: New area for my courses
David Monllao [Tue, 26 Apr 2016 06:21:34 +0000 (14:21 +0800)]
MDL-53170 search: New area for my courses

Thanks to Skylar Kelty for the initial implementation.

6 years agoMDL-53170 search: API fixes for core subsystems
David Monllao [Tue, 26 Apr 2016 07:10:54 +0000 (15:10 +0800)]
MDL-53170 search: API fixes for core subsystems

6 years agoMDL-54102 core: added more details about hooks
Mark Nelson [Tue, 10 May 2016 07:24:09 +0000 (15:24 +0800)]
MDL-54102 core: added more details about hooks

6 years agoMDL-54103 enrol_lti: show frame embedding warning
Mark Nelson [Mon, 9 May 2016 09:10:49 +0000 (17:10 +0800)]
MDL-54103 enrol_lti: show frame embedding warning