Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 20:35:53 +0000 (22:35 +0200)]
Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 18:02:22 +0000 (20:02 +0200)]
Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 17:11:51 +0000 (19:11 +0200)]
Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 17:08:08 +0000 (19:08 +0200)]
Merge branch 'MDL-56293-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 17:06:26 +0000 (19:06 +0200)]
Merge branch 'MDL-53752-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 15:34:36 +0000 (17:34 +0200)]
Merge branch 'MDL-29774-master-by-sam-wilson' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 18 Oct 2016 16:19:03 +0000 (17:19 +0100)]
MDL-56082 auth: minor tweak to login block idp links
No longer set the return url to $SESSION->wantsurl, it doens't make
sense in this context, as the user is probably on the page they want.
Also add a note about this functionality to auth/ugrade.txt
Dan Poltawski [Tue, 18 Oct 2016 16:03:21 +0000 (17:03 +0100)]
Merge branch 'master' of https://github.com/rimas-kudelis/moodle
Dan Poltawski [Tue, 18 Oct 2016 15:31:42 +0000 (16:31 +0100)]
Merge branch 'MDL-55926-master-3' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 15:00:21 +0000 (17:00 +0200)]
Merge branch 'MDL-55858-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Oct 2016 14:26:31 +0000 (15:26 +0100)]
Merge branch 'wip-MDL-55833-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 18 Oct 2016 12:48:46 +0000 (13:48 +0100)]
Merge branch 'MDL-55736-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 18 Oct 2016 12:44:33 +0000 (13:44 +0100)]
Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Oct 2016 12:24:08 +0000 (13:24 +0100)]
MDL-55924 behat: fix misleading comment
Dan Poltawski [Tue, 18 Oct 2016 12:22:56 +0000 (13:22 +0100)]
Merge branch 'wip-mdl-55924' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 18 Oct 2016 11:37:32 +0000 (12:37 +0100)]
Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 18 Oct 2016 11:32:08 +0000 (12:32 +0100)]
Merge branch 'wip-MDL-55087-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 18 Oct 2016 11:06:27 +0000 (12:06 +0100)]
Merge branch 'MDL-56062-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Tue, 18 Oct 2016 10:26:18 +0000 (11:26 +0100)]
Merge branch 'MDL-56159_master-phpunit-fix' of git://github.com/dmonllao/moodle
David Monllao [Tue, 18 Oct 2016 10:24:47 +0000 (18:24 +0800)]
MDL-56159 user: Fix unit test
The exception that is being thrown changed to moodle_exception
with usernotfullysetup error code.
Dan Poltawski [Tue, 18 Oct 2016 10:24:36 +0000 (11:24 +0100)]
Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 10:11:10 +0000 (12:11 +0200)]
Merge branch 'MDL-56275-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 6 Oct 2016 08:50:27 +0000 (09:50 +0100)]
MDL-56275 blog: do not display the 'choose a link' button
When registereing an external blog the choose a link button is
misleading, we don't have any repos which restrict to RSS feeds, so the
majority of results you get from the repo picker will be wrong.
David Monllao [Tue, 18 Oct 2016 09:27:48 +0000 (17:27 +0800)]
Merge branch 'MDL-56159-master' of git://github.com/jleyva/moodle
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
Juan Leyva [Wed, 28 Sep 2016 10:20:09 +0000 (11:20 +0100)]
MDL-56159 webservice: Tolerate exceptions in the get_autologin_key ws
Juan Leyva [Wed, 28 Sep 2016 10:06:20 +0000 (11:06 +0100)]
MDL-56159 webservice: Improve not fully setup and missing pwd checks
Removing the check in login/token.php is secure since the
auth_forcepasswordchange is checked in require_login that is called via
validate_context.
The user must be able to get a token even if that setting is on. With
that token we’ll redirect the user to the site or we’ll change the
password when a new WS for that is available.
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.
Sam Wilson [Thu, 16 Jun 2016 12:40:13 +0000 (13:40 +0100)]
MDL-29774 core_user: Update group-membership summaries on AJAX calls
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
Ryan Wyllie [Fri, 14 Oct 2016 00:30:13 +0000 (00:30 +0000)]
MDL-55926 message: add behat tests for message ui
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
Michael Aherne [Tue, 27 Sep 2016 11:25:06 +0000 (12:25 +0100)]
MDL-56131 choice: Set maximum lifetime for lock
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
Adrian Greeve [Fri, 14 Oct 2016 02:34:24 +0000 (10:34 +0800)]
MDL-55087 lib: Update to htmlpurifier lib.
Adrian Greeve [Fri, 14 Oct 2016 02:35:04 +0000 (10:35 +0800)]
MDL-55087 lib: Update htmlpurifier to v4.8.0.
Ryan Wyllie [Mon, 17 Oct 2016 00:27:56 +0000 (00:27 +0000)]
MDL-56430 message: fix php7 incompatibility in processor form
Rimas Kudelis [Tue, 20 Sep 2016 15:22:07 +0000 (18:22 +0300)]
MDL-56082 Expose external authentication methods in login block
Unlike the login page, login block currently does not list any configured external auth methods.
This makes it practically useless in cases where external auth (e.g. OpenID Connect) is the main login method.
This patch adds the necessary bits to make the login block great again.
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 [Mon, 19 Sep 2016 04:18:08 +0000 (12:18 +0800)]
MDL-53752 mod_book: Clarify book title
Andrew Nicols [Wed, 10 Aug 2016 04:42:49 +0000 (12:42 +0800)]
MDL-55518 travis: Enable redis tests
Andrew Nicols [Mon, 10 Oct 2016 07:00:20 +0000 (15:00 +0800)]
MDL-55858 mod_forum: Remove subscription links when not relevant
When a forum is force-subscribed or subscription is disabled, do not
include the subscription link in forum posts.
Andrew Nicols [Fri, 14 Oct 2016 03:56:53 +0000 (11:56 +0800)]
MDL-56295 mod_book: Refactor of chapter delete page
Andrew Nicols [Thu, 6 Oct 2016 08:03:04 +0000 (16:03 +0800)]
MDL-56295 mod_book: JS Confirmation of chapter removal
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
