Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 09:21:31 +0000 (11:21 +0200)]
Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 18 Oct 2016 09:14:11 +0000 (17:14 +0800)]
MDL-56277 theme_boost: Converting EOLs to unix style
David Monllao [Tue, 18 Oct 2016 08:33:21 +0000 (16:33 +0800)]
Merge branch 'MDL-56277-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 08:11:33 +0000 (10:11 +0200)]
MDL-55175 course: Fix typo & parenthesis
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 08:01:15 +0000 (10:01 +0200)]
Merge branch 'MDL-55175-master-2' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 18 Oct 2016 08:05:53 +0000 (16:05 +0800)]
Merge branch 'MDL-56328-M32' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 07:37:47 +0000 (09:37 +0200)]
Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle
David Monllao [Tue, 18 Oct 2016 07:02:41 +0000 (15:02 +0800)]
Merge branch 'MDL-56214-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 18 Oct 2016 06:00:29 +0000 (14:00 +0800)]
Merge branch 'MDL-56411-int-fix' of github.com:ryanwyllie/moodle
Ryan Wyllie [Tue, 18 Oct 2016 02:00:09 +0000 (02:00 +0000)]
MDL-56411 message: dont render message area without other user
Stop the message area header and footer from being rendered if there is
no other user being messaged, otherwise notices are generated and the
messages fail to send.
David Monllao [Tue, 18 Oct 2016 00:40:25 +0000 (08:40 +0800)]
MDL-45639 ws: Remove trailing whitespace
David Monllao [Tue, 18 Oct 2016 00:26:25 +0000 (08:26 +0800)]
Merge branch 'MDL-45639-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 23:58:31 +0000 (01:58 +0200)]
Merge branch 'wip-MDL-48629-master' of https://github.com/Beedell/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 23:43:52 +0000 (01:43 +0200)]
Merge branch 'MDL-55518-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 23:32:58 +0000 (01:32 +0200)]
Merge branch 'wip-mdl-56369' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 23:10:23 +0000 (01:10 +0200)]
Merge branch 'wip-mdl-56348' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 22:38:47 +0000 (00:38 +0200)]
Merge branch 'MDL-56368-M32' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2016 22:07:17 +0000 (00:07 +0200)]
Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle
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.
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
Stephen Bourget [Mon, 17 Oct 2016 20:19:28 +0000 (16:19 -0400)]
MDL-56022 Assign: Make folders structure in the downloaded zip optional
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
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
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
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
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
Dan Poltawski [Mon, 17 Oct 2016 11:52:26 +0000 (12:52 +0100)]
Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/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
Dan Poltawski [Mon, 17 Oct 2016 10:01:27 +0000 (11:01 +0100)]
Merge branch 'MDL-56262-master' of git://github.com/FMCorz/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
Dan Poltawski [Mon, 17 Oct 2016 09:00:08 +0000 (10:00 +0100)]
Merge branch 'MDL-31465-master' of git://github.com/lameze/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
David Monllao [Mon, 17 Oct 2016 07:32:33 +0000 (15:32 +0800)]
Merge branch 'MDL-56393-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
David Monllao [Mon, 17 Oct 2016 07:17:16 +0000 (15:17 +0800)]
Merge branch 'MDL-56415-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
David Monllao [Mon, 17 Oct 2016 06:25:00 +0000 (14:25 +0800)]
Merge branch 'MDL-55510-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Mon, 10 Oct 2016 07:22:01 +0000 (15:22 +0800)]
MDL-56208 mod_forum: Move Display period below Group
Andrew Nicols [Fri, 29 Jul 2016 02:07:18 +0000 (10:07 +0800)]
MDL-55175 course: Begin deprecation process for pring_log_*
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.
Ryan Wyllie [Thu, 13 Oct 2016 05:41:34 +0000 (05:41 +0000)]
MDL-56338 message_popup: add behat tests for message popover
Ryan Wyllie [Mon, 17 Oct 2016 00:27:56 +0000 (00:27 +0000)]
MDL-56430 message: fix php7 incompatibility in processor form
John Beedell [Mon, 10 Oct 2016 15:14:51 +0000 (16:14 +0100)]
MDL-48629 Quiz: Change separator for matching correct answer feedback
lazydaisy [Tue, 11 Oct 2016 23:05:31 +0000 (00:05 +0100)]
MDL-56368 theme_bootstrapbase: Settings for Restrict Access not inline.
lazydaisy [Sat, 8 Oct 2016 00:47:10 +0000 (01:47 +0100)]
MDL-56328 theme_bootstrapbase: reduce activity indent when not editing
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.
Charles Fulton [Fri, 23 Sep 2016 01:33:38 +0000 (21:33 -0400)]
MDL-56100 mod_folder: add support for recent activity
Juan Leyva [Sun, 25 Sep 2016 20:50:38 +0000 (21:50 +0100)]
MDL-45639 tool_mobile: Support auto-login from the app to the site
We din't call it SSO because:
- SSO usually requires a 3rd party for authentication
- SSO term is already used in tool_mobile when supporting using auth methods like CAS or Shibboleth
Juan Leyva [Sun, 25 Sep 2016 20:50:00 +0000 (21:50 +0100)]
MDL-45639 webservice: Support private tokens
Private tokens are generated at the same time that the token.
They must be stored safely by the ws client, and they must be transmitted only via https.
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.
Ryan Wyllie [Fri, 14 Oct 2016 07:52:04 +0000 (07:52 +0000)]
MDL-56393 themes: unread notification style in popover
Dan Poltawski [Thu, 13 Oct 2016 16:28:56 +0000 (17:28 +0100)]
MDL-56440 theme_boost: fix logic errors in templates
Dan Poltawski [Fri, 14 Oct 2016 07:29:51 +0000 (08:29 +0100)]
MDL-56436 mustache: update import docs
Marc Català [Thu, 6 Oct 2016 11:59:06 +0000 (13:59 +0200)]
MDL-56300 mod_assign: Filtering students throws a javascript error
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.
acorbier [Tue, 11 Oct 2016 10:19:22 +0000 (12:19 +0200)]
MDL-56369 behat: Updated comment for i_look_for_exceptions
After upgrade to Behat 3.x, i_look_for_exception is called from
Moodle\BehatExtension\EventDispatcher\Tester\ChainedStepTester
Andrew Nicols [Wed, 10 Aug 2016 04:42:49 +0000 (12:42 +0800)]
MDL-55518 travis: Enable redis tests
Simey Lameze [Fri, 14 Oct 2016 02:44:08 +0000 (10:44 +0800)]
MDL-31465 core_user: Suspended field must be boolean
Andrew Solomon [Sun, 9 Oct 2016 21:50:49 +0000 (21:50 +0000)]
MDL-31465 core_user: Incorporate user suspension into webservices
Ryan Wyllie [Tue, 11 Oct 2016 02:32:18 +0000 (02:32 +0000)]
MDL-56337 message_popup: add behat tests for notification popover
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 18:02:19 +0000 (20:02 +0200)]
weekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 13 Oct 2016 18:02:16 +0000 (20:02 +0200)]
NOBUG: Fixed SVG browser compatibility
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
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
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
Rajesh Taneja [Thu, 13 Oct 2016 02:47:32 +0000 (10:47 +0800)]
MDL-56299 behat: Popover doesn't work with phantomjs
David Monllao [Thu, 13 Oct 2016 02:18:20 +0000 (10:18 +0800)]
Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 13 Oct 2016 01:57:53 +0000 (09:57 +0800)]
MDL-56087 behat: Fixed no messages string
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
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
Dan Poltawski [Wed, 12 Oct 2016 08:26:26 +0000 (09:26 +0100)]
Merge branch 'MDL-56384_master' of https://github.com/markn86/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
Mark Nelson [Wed, 12 Oct 2016 07:14:30 +0000 (15:14 +0800)]
MDL-56384 message_popup: fixed oracle PHPUnit failures
Cameron Ball [Wed, 12 Oct 2016 05:10:30 +0000 (13:10 +0800)]
MDL-56095 output: Properly set prototype on custom event for IE
Rajesh Taneja [Wed, 12 Oct 2016 04:57:22 +0000 (12:57 +0800)]
MDL-27072 behat: Removed wrong tag from feature
David Monllao [Wed, 12 Oct 2016 03:29:59 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 12 Oct 2016 02:45:27 +0000 (10:45 +0800)]
MDL-55393 message: Missing latest blocker issue code updates
Rajesh Taneja [Wed, 12 Oct 2016 02:48:48 +0000 (10:48 +0800)]
MDL-27072 behat: Fixed table separators
Juan Leyva [Tue, 20 Sep 2016 16:18:21 +0000 (17:18 +0100)]
MDL-55393 message: New WS get_user_notification_preferences
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
Juan Leyva [Tue, 20 Sep 2016 13:35:26 +0000 (14:35 +0100)]
MDL-55393 message: Add some external functions to mobile service
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
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.
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.
Dan Poltawski [Thu, 13 Oct 2016 08:20:08 +0000 (09:20 +0100)]
MDL-56423 boostrap: fix eranously removed css
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
Rajesh Taneja [Thu, 13 Oct 2016 02:47:32 +0000 (10:47 +0800)]
MDL-56299 behat: Popover doesn't work with phantomjs
David Monllao [Thu, 13 Oct 2016 02:18:20 +0000 (10:18 +0800)]
Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 13 Oct 2016 01:57:53 +0000 (09:57 +0800)]
MDL-56087 behat: Fixed no messages string
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
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
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.
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
Dan Poltawski [Wed, 12 Oct 2016 13:53:01 +0000 (14:53 +0100)]
Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
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
Tony Butler [Wed, 12 Oct 2016 13:17:48 +0000 (14:17 +0100)]
MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page
Dan Poltawski [Wed, 12 Oct 2016 08:26:26 +0000 (09:26 +0100)]
Merge branch 'MDL-56384_master' of https://github.com/markn86/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
Mark Nelson [Wed, 12 Oct 2016 07:14:30 +0000 (15:14 +0800)]
MDL-56384 message_popup: fixed oracle PHPUnit failures
Cameron Ball [Wed, 12 Oct 2016 05:10:30 +0000 (13:10 +0800)]
MDL-56095 output: Properly set prototype on custom event for IE
Rajesh Taneja [Wed, 12 Oct 2016 04:57:22 +0000 (12:57 +0800)]
MDL-27072 behat: Removed wrong tag from feature
