moodle.git
5 years agoMDL-56100 mod_folder: add missing $OUTPUT for recent activity report.
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 21:06:54 +0000 (23:06 +0200)]
MDL-56100 mod_folder: add missing $OUTPUT for recent activity report.

5 years agoMerge branch 'MDL-56100-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 20:58:11 +0000 (22:58 +0200)]
Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle

5 years agoMerge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 18:55:23 +0000 (20:55 +0200)]
Merge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56300_master' of git://github.com/reskit/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 16:50:07 +0000 (18:50 +0200)]
Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle

5 years agoMerge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 16:42:14 +0000 (18:42 +0200)]
Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 11:20:52 +0000 (13:20 +0200)]
Merge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 17 Oct 2016 11:52:26 +0000 (12:52 +0100)]
Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 17 Oct 2016 11:06:42 +0000 (12:06 +0100)]
Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle

5 years agoMerge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 17 Oct 2016 10:01:27 +0000 (11:01 +0100)]
Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle
Dan Poltawski [Mon, 17 Oct 2016 09:23:35 +0000 (10:23 +0100)]
Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-31465-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 17 Oct 2016 09:00:08 +0000 (10:00 +0100)]
Merge branch 'MDL-31465-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'MDL-56423-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 17 Oct 2016 07:51:51 +0000 (15:51 +0800)]
Merge branch 'MDL-56423-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56393-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 17 Oct 2016 07:32:33 +0000 (15:32 +0800)]
Merge branch 'MDL-56393-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-56411-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 17 Oct 2016 07:29:13 +0000 (15:29 +0800)]
Merge branch 'MDL-56411-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-56415-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 17 Oct 2016 07:17:16 +0000 (15:17 +0800)]
Merge branch 'MDL-56415-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-56430-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 17 Oct 2016 07:03:51 +0000 (15:03 +0800)]
Merge branch 'MDL-56430-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-55510-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 17 Oct 2016 06:25:00 +0000 (14:25 +0800)]
Merge branch 'MDL-55510-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-56208 mod_forum: Move Display period below Group
Andrew Nicols [Mon, 10 Oct 2016 07:22:01 +0000 (15:22 +0800)]
MDL-56208 mod_forum: Move Display period below Group

5 years agoMDL-56415 message: style toggle contact button on user profile page
Ryan Wyllie [Fri, 14 Oct 2016 07:36:24 +0000 (07:36 +0000)]
MDL-56415 message: style toggle contact button on user profile page

Changed the styles in theme_bootstrapbase for the ajax toggle
button so that the loading icon is overlaid on the element
rather than replacing it to stop the interface jarring.

Also ported those same styles to theme_boost for consistency.

5 years agoMDL-56338 message_popup: add behat tests for message popover
Ryan Wyllie [Thu, 13 Oct 2016 05:41:34 +0000 (05:41 +0000)]
MDL-56338 message_popup: add behat tests for message popover

5 years agoMDL-56430 message: fix php7 incompatibility in processor form
Ryan Wyllie [Mon, 17 Oct 2016 00:27:56 +0000 (00:27 +0000)]
MDL-56430 message: fix php7 incompatibility in processor form

5 years agoMDL-55630 mod_assign: Exclude users courses from user details
Jean-Philippe Gaudreau [Tue, 13 Sep 2016 16:08:46 +0000 (12:08 -0400)]
MDL-55630 mod_assign: Exclude users courses from user details

Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.

5 years agoMDL-56100 mod_folder: add support for recent activity
Charles Fulton [Fri, 23 Sep 2016 01:33:38 +0000 (21:33 -0400)]
MDL-56100 mod_folder: add support for recent activity

5 years agoMDL-55510 upgrade: remove repository_alfresco config
Dan Poltawski [Wed, 12 Oct 2016 10:15:52 +0000 (11:15 +0100)]
MDL-55510 upgrade: remove repository_alfresco config

This was missing from MDL-49533 and caused a complaint about alfresco
on every upgrade.

5 years agoMDL-56393 themes: unread notification style in popover
Ryan Wyllie [Fri, 14 Oct 2016 07:52:04 +0000 (07:52 +0000)]
MDL-56393 themes: unread notification style in popover

5 years agoMDL-56440 theme_boost: fix logic errors in templates
Dan Poltawski [Thu, 13 Oct 2016 16:28:56 +0000 (17:28 +0100)]
MDL-56440 theme_boost: fix logic errors in templates

5 years agoMDL-56300 mod_assign: Filtering students throws a javascript error
Marc Català [Thu, 6 Oct 2016 11:59:06 +0000 (13:59 +0200)]
MDL-56300 mod_assign: Filtering students throws a javascript error

5 years agoMDL-56411 message: new message to user renders message area
Ryan Wyllie [Fri, 14 Oct 2016 07:13:58 +0000 (07:13 +0000)]
MDL-56411 message: new message to user renders message area

When messaging a user for the first time from the message button on
their profile page the message area should still be rendered.

5 years agoMDL-31465 core_user: Suspended field must be boolean
Simey Lameze [Fri, 14 Oct 2016 02:44:08 +0000 (10:44 +0800)]
MDL-31465 core_user: Suspended field must be boolean

5 years agoMDL-31465 core_user: Incorporate user suspension into webservices
Andrew Solomon [Sun, 9 Oct 2016 21:50:49 +0000 (21:50 +0000)]
MDL-31465 core_user: Incorporate user suspension into webservices

5 years agoMDL-56337 message_popup: add behat tests for notification popover
Ryan Wyllie [Tue, 11 Oct 2016 02:32:18 +0000 (02:32 +0000)]
MDL-56337 message_popup: add behat tests for notification popover

5 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 18:02:19 +0000 (20:02 +0200)]
weekly release 3.2dev

5 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 18:02:16 +0000 (20:02 +0200)]
NOBUG: Fixed SVG browser compatibility

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 18:02:15 +0000 (20:02 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMerge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 07:55:36 +0000 (09:55 +0200)]
Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 13 Oct 2016 02:51:12 +0000 (10:51 +0800)]
Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56299 behat: Popover doesn't work with phantomjs
Rajesh Taneja [Thu, 13 Oct 2016 02:47:32 +0000 (10:47 +0800)]
MDL-56299 behat: Popover doesn't work with phantomjs

5 years agoMerge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 13 Oct 2016 02:18:20 +0000 (10:18 +0800)]
Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56087 behat: Fixed no messages string
Rajesh Taneja [Thu, 13 Oct 2016 01:57:53 +0000 (09:57 +0800)]
MDL-56087 behat: Fixed no messages string

5 years agoMDL-55522 behat: Commented failing transformations
Rajesh Taneja [Thu, 13 Oct 2016 01:41:15 +0000 (09:41 +0800)]
MDL-55522 behat: Commented failing transformations

- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959

5 years agoMDL-54682 core_message: do not disable left panel when deleting messages
Mark Nelson [Wed, 12 Oct 2016 10:01:23 +0000 (18:01 +0800)]
MDL-54682 core_message: do not disable left panel when deleting messages

5 years agoMerge branch 'MDL-56384_master' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 12 Oct 2016 08:26:26 +0000 (09:26 +0100)]
Merge branch 'MDL-56384_master' of https://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle
David Monllao [Wed, 12 Oct 2016 07:17:37 +0000 (15:17 +0800)]
Merge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle

5 years agoMDL-56384 message_popup: fixed oracle PHPUnit failures
Mark Nelson [Wed, 12 Oct 2016 07:14:30 +0000 (15:14 +0800)]
MDL-56384 message_popup: fixed oracle PHPUnit failures

5 years agoMDL-56095 output: Properly set prototype on custom event for IE
Cameron Ball [Wed, 12 Oct 2016 05:10:30 +0000 (13:10 +0800)]
MDL-56095 output: Properly set prototype on custom event for IE

5 years agoMDL-27072 behat: Removed wrong tag from feature
Rajesh Taneja [Wed, 12 Oct 2016 04:57:22 +0000 (12:57 +0800)]
MDL-27072 behat: Removed wrong tag from feature

5 years agoMerge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 12 Oct 2016 03:29:59 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle

5 years agoMDL-55393 message: Missing latest blocker issue code updates
David Monllao [Wed, 12 Oct 2016 02:45:27 +0000 (10:45 +0800)]
MDL-55393 message: Missing latest blocker issue code updates

5 years agoMDL-27072 behat: Fixed table separators
Rajesh Taneja [Wed, 12 Oct 2016 02:48:48 +0000 (10:48 +0800)]
MDL-27072 behat: Fixed table separators

5 years agoMDL-55393 message: New WS get_user_notification_preferences
Juan Leyva [Tue, 20 Sep 2016 16:18:21 +0000 (17:18 +0100)]
MDL-55393 message: New WS get_user_notification_preferences

5 years agoMerge branch 'MDL-56319-m' of https://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 18:24:13 +0000 (20:24 +0200)]
Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle

5 years agoMDL-55393 message: Add some external functions to mobile service
Juan Leyva [Tue, 20 Sep 2016 13:35:26 +0000 (14:35 +0100)]
MDL-55393 message: Add some external functions to mobile service

5 years agoMerge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 18:13:04 +0000 (20:13 +0200)]
Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56423 stylelint: ignore custom.css files
Dan Poltawski [Thu, 13 Oct 2016 08:32:14 +0000 (09:32 +0100)]
MDL-56423 stylelint: ignore custom.css files

The files have non-standard css syntax and with stylelint 7.4.1
it can no longer cope with it.

5 years agoMDL-56423 stylelint: bump to v7.4.1
Dan Poltawski [Thu, 13 Oct 2016 08:26:09 +0000 (09:26 +0100)]
MDL-56423 stylelint: bump to v7.4.1

Fixes a false positive with  declaration-block-no-ignored-properties and
display: inline.

5 years agoMDL-56423 boostrap: fix eranously removed css
Dan Poltawski [Thu, 13 Oct 2016 08:20:08 +0000 (09:20 +0100)]
MDL-56423 boostrap: fix eranously removed css

5 years agoMerge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 13 Oct 2016 02:51:12 +0000 (10:51 +0800)]
Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56299 behat: Popover doesn't work with phantomjs
Rajesh Taneja [Thu, 13 Oct 2016 02:47:32 +0000 (10:47 +0800)]
MDL-56299 behat: Popover doesn't work with phantomjs

5 years agoMerge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 13 Oct 2016 02:18:20 +0000 (10:18 +0800)]
Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56087 behat: Fixed no messages string
Rajesh Taneja [Thu, 13 Oct 2016 01:57:53 +0000 (09:57 +0800)]
MDL-56087 behat: Fixed no messages string

5 years agoMDL-55522 behat: Commented failing transformations
Rajesh Taneja [Thu, 13 Oct 2016 01:41:15 +0000 (09:41 +0800)]
MDL-55522 behat: Commented failing transformations

- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959

5 years agoMDL-56110 forms: debug message for php 7.1 compat
Marina Glancy [Sun, 25 Sep 2016 05:20:53 +0000 (13:20 +0800)]
MDL-56110 forms: debug message for php 7.1 compat

Follow up for MDL-55123

5 years agoMDL-54945 workshop: Improve the portfolio API implementation
David Mudrák [Tue, 11 Oct 2016 10:36:44 +0000 (12:36 +0200)]
MDL-54945 workshop: Improve the portfolio API implementation

* Use a single capability 'mod/workshop:exportsubmissions' to control
  who is able to export a submission and all associated visible
  peer-assessments.
* The export capability is by default granted to teachers and managers
  as well.
* Simplify the integration of the export button into the submission
  page. There is now a single place where the export button appears - at
  the buttom of the submission page.
* Clean up the new strings introduced for this feature.
* Rewrite the portfolio caller class so that it better mimics the
  behaviour of the submission.php page. It must not be possible to get
  access to contents otherwise not available via the UI.
* Fix phpunit tests.
* Improve behat tests so that they can run in headless browser
  (performance).

During the development, some problems were detected in the underlying
portfolio API, especially with LEAP2A format and files collisions
handling. These may be eventually fixed in the future, should there be a
demand for it.

5 years agoMerge branch 'MDL-54682_master-fix-alt' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 12 Oct 2016 14:21:02 +0000 (15:21 +0100)]
Merge branch 'MDL-54682_master-fix-alt' of https://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Wed, 12 Oct 2016 13:53:01 +0000 (14:53 +0100)]
Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle

5 years agoMDL-54682 core_message: do not disable left panel when deleting messages
Mark Nelson [Wed, 12 Oct 2016 10:01:23 +0000 (18:01 +0800)]
MDL-54682 core_message: do not disable left panel when deleting messages

5 years agoMDL-56324 assignfeedback_editpdf: Use correct page in save_current_page
Tony Butler [Wed, 12 Oct 2016 13:17:48 +0000 (14:17 +0100)]
MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page

5 years agoMerge branch 'MDL-56384_master' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 12 Oct 2016 08:26:26 +0000 (09:26 +0100)]
Merge branch 'MDL-56384_master' of https://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle
David Monllao [Wed, 12 Oct 2016 07:17:37 +0000 (15:17 +0800)]
Merge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle

5 years agoMDL-56384 message_popup: fixed oracle PHPUnit failures
Mark Nelson [Wed, 12 Oct 2016 07:14:30 +0000 (15:14 +0800)]
MDL-56384 message_popup: fixed oracle PHPUnit failures

5 years agoMDL-56095 output: Properly set prototype on custom event for IE
Cameron Ball [Wed, 12 Oct 2016 05:10:30 +0000 (13:10 +0800)]
MDL-56095 output: Properly set prototype on custom event for IE

5 years agoMDL-27072 behat: Removed wrong tag from feature
Rajesh Taneja [Wed, 12 Oct 2016 04:57:22 +0000 (12:57 +0800)]
MDL-27072 behat: Removed wrong tag from feature

5 years agoMerge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 12 Oct 2016 03:29:59 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle

5 years agoMDL-27072 behat: Fixed table separators
Rajesh Taneja [Wed, 12 Oct 2016 02:48:48 +0000 (10:48 +0800)]
MDL-27072 behat: Fixed table separators

5 years agoMDL-55393 message: Missing latest blocker issue code updates
David Monllao [Wed, 12 Oct 2016 02:45:27 +0000 (10:45 +0800)]
MDL-55393 message: Missing latest blocker issue code updates

5 years agoMDL-55393 message: New WS get_user_notification_preferences
Juan Leyva [Tue, 20 Sep 2016 16:18:21 +0000 (17:18 +0100)]
MDL-55393 message: New WS get_user_notification_preferences

5 years agoMDL-55393 message: Add some external functions to mobile service
Juan Leyva [Tue, 20 Sep 2016 13:35:26 +0000 (14:35 +0100)]
MDL-55393 message: Add some external functions to mobile service

5 years agoMDL-56057 search: Fix incorrectly reported no enabled search areas
David Monllao [Wed, 21 Sep 2016 09:07:36 +0000 (17:07 +0800)]
MDL-56057 search: Fix incorrectly reported no enabled search areas

Also improved performance caching enabled search areas and
all search areas at the same time.

5 years agoMerge branch 'MDL-56319-m' of https://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 18:24:13 +0000 (20:24 +0200)]
Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle

5 years agoMDL-54945 workshop: Introduce workshop::check_group_membership() method
David Mudrák [Tue, 11 Oct 2016 18:21:30 +0000 (20:21 +0200)]
MDL-54945 workshop: Introduce workshop::check_group_membership() method

This is just a refactored code block present at two different places. We
will need the same logic in the portfolio caller class soit made sense
to implement it as a new method, rather than make another copy&paste.

As a side effect, the logic is now properly unit tested.

5 years agoMerge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 18:13:04 +0000 (20:13 +0200)]
Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Tue, 11 Oct 2016 16:35:07 +0000 (17:35 +0100)]
Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle

5 years agoAutomatically generated installer lang files
AMOS bot [Tue, 11 Oct 2016 16:04:48 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-55345' of https://github.com/paulholden/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 15:06:17 +0000 (17:06 +0200)]
Merge branch 'MDL-55345' of https://github.com/paulholden/moodle

5 years agoMDL-54682 message: fix eslint issues
Dan Poltawski [Tue, 11 Oct 2016 12:29:56 +0000 (13:29 +0100)]
MDL-54682 message: fix eslint issues

5 years agoMDL-54682 deprecatedlib: fix trailing whitespace
Dan Poltawski [Tue, 11 Oct 2016 12:17:42 +0000 (13:17 +0100)]
MDL-54682 deprecatedlib: fix trailing whitespace

5 years agoMerge branch 'MDL-54682_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 11 Oct 2016 11:52:12 +0000 (12:52 +0100)]
Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle

5 years agoMDL-54945 workshop: Workshop portfolio API integration
Loc Nguyen [Fri, 22 Jul 2016 13:20:42 +0000 (20:20 +0700)]
MDL-54945 workshop: Workshop portfolio API integration

Users can export their own submission
Users can export feedback/assessment received from other users

5 years agoMerge branch 'MDL-56147-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 10:49:56 +0000 (12:49 +0200)]
Merge branch 'MDL-56147-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-55954_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 10:46:32 +0000 (12:46 +0200)]
Merge branch 'MDL-55954_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'wip-mdl-56248' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 10:15:05 +0000 (12:15 +0200)]
Merge branch 'wip-mdl-56248' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'master_MDL-51401' of https://github.com/janeklb/moodle
David Monllao [Tue, 11 Oct 2016 09:58:05 +0000 (17:58 +0800)]
Merge branch 'master_MDL-51401' of https://github.com/janeklb/moodle

5 years agoMerge branch 'MDL-55921' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 11 Oct 2016 09:54:23 +0000 (11:54 +0200)]
Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle

5 years agoMerge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 11 Oct 2016 09:11:21 +0000 (17:11 +0800)]
Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-36611-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 11 Oct 2016 07:53:06 +0000 (08:53 +0100)]
Merge branch 'MDL-36611-master' of git://github.com/junpataleta/moodle

5 years agoMDL-54682 core: build amd modules
Mark Nelson [Fri, 12 Aug 2016 06:29:27 +0000 (14:29 +0800)]
MDL-54682 core: build amd modules

5 years agoMDL-56299 core: fixed failing Behat tests
Mark Nelson [Thu, 6 Oct 2016 09:43:06 +0000 (17:43 +0800)]
MDL-56299 core: fixed failing Behat tests

This also involved removing legacy Behat tests.

5 years agoMDL-56087 message: change conversations to messages
Ryan Wyllie [Mon, 10 Oct 2016 05:44:51 +0000 (05:44 +0000)]
MDL-56087 message: change conversations to messages

5 years agoMDL-56274 message: unlock tabs and search after delete all
Ryan Wyllie [Mon, 10 Oct 2016 06:41:20 +0000 (06:41 +0000)]
MDL-56274 message: unlock tabs and search after delete all

5 years agoMDL-56336 core_message: fix WS exception when 'forcepasswordchange' set
Mark Nelson [Mon, 10 Oct 2016 05:25:21 +0000 (13:25 +0800)]
MDL-56336 core_message: fix WS exception when 'forcepasswordchange' set