Eloy Lafuente (stronk7) [Fri, 21 Oct 2016 11:03:56 +0000 (13:03 +0200)]
Merge branch 'MDL-56529-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 21 Oct 2016 04:34:00 +0000 (12:34 +0800)]
MDL-56529 enrol_lti: Fix for tool_provider_test
* Use -1 for simulating a non-existent tool for
tool_provider_testcase::test_constructor_with_non_existent_tool()
Eloy Lafuente (stronk7) [Thu, 20 Oct 2016 15:52:33 +0000 (17:52 +0200)]
weekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 20 Oct 2016 15:52:32 +0000 (17:52 +0200)]
NOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 20 Oct 2016 15:52:29 +0000 (17:52 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 20 Oct 2016 07:02:08 +0000 (08:02 +0100)]
Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle
Andrew Nicols [Thu, 20 Oct 2016 06:51:26 +0000 (14:51 +0800)]
MDL-52777 tool_usertours: Stop testing pending upgrades
Andrew Nicols [Thu, 20 Oct 2016 06:50:38 +0000 (14:50 +0800)]
MDL-52777 tool_usertours: Fix matching tour test
David Monllao [Thu, 20 Oct 2016 06:09:57 +0000 (14:09 +0800)]
Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle
Andrew Nicols [Thu, 20 Oct 2016 05:44:18 +0000 (13:44 +0800)]
MDL-52777 tool_usertours: Only return tours with steps
David Monllao [Thu, 20 Oct 2016 03:50:32 +0000 (11:50 +0800)]
Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle
David Monllao [Thu, 20 Oct 2016 03:48:53 +0000 (11:48 +0800)]
Merge branch 'wip-mdl-55926' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 20 Oct 2016 03:26:27 +0000 (11:26 +0800)]
MDL-55926 behat: Fixed undefined steps
Andrew Nicols [Thu, 20 Oct 2016 03:16:52 +0000 (11:16 +0800)]
MDL-52777 tool_usertours: Only check plugin for needs update
The moodle_needs_upgrade() function includes every version.php in Moodle
which poses a performance issue, especially when called on every page.
David Monllao [Thu, 20 Oct 2016 02:09:28 +0000 (10:09 +0800)]
Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle
Andrew Nicols [Thu, 20 Oct 2016 01:54:26 +0000 (09:54 +0800)]
MDL-52777 tool_usertours: Correct & to && in test
Eloy Lafuente (stronk7) [Thu, 20 Oct 2016 00:25:59 +0000 (02:25 +0200)]
Merge branch 'MDL-53832-master-review-fixes' of https://github.com/junpataleta/moodle
Dan Poltawski [Wed, 19 Oct 2016 09:47:35 +0000 (10:47 +0100)]
Merge branch 'MDL-55823_master' of git://github.com/markn86/moodle
Mark Nelson [Fri, 9 Sep 2016 09:07:58 +0000 (17:07 +0800)]
MDL-55823 core_message: added WS unit tests
Jun Pataleta [Wed, 19 Oct 2016 07:37:01 +0000 (15:37 +0800)]
MDL-53832 enrol_lti: Update codes to use the new DB field names
Jun Pataleta [Wed, 19 Oct 2016 07:24:07 +0000 (15:24 +0800)]
MDL-53832 enrol_lti: Update data_connector to use the new DB field names
Jun Pataleta [Wed, 19 Oct 2016 07:15:33 +0000 (15:15 +0800)]
MDL-53832 enrol_lti: Make DB column names more moodle-ish
Andrew Nicols [Wed, 19 Oct 2016 07:35:54 +0000 (15:35 +0800)]
MDL-52777 tool_usertours: Prepare target data when displaying form
David Monllao [Wed, 19 Oct 2016 07:02:44 +0000 (15:02 +0800)]
Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle
Andrew Nicols [Wed, 19 Oct 2016 06:57:07 +0000 (14:57 +0800)]
MDL-52777 tool_usertours: Less strict comparison for tour ID
Ryan Wyllie [Wed, 19 Oct 2016 06:35:12 +0000 (06:35 +0000)]
MDL-56337 message: fix behat for phantomjs
Andrew Nicols [Wed, 19 Oct 2016 05:26:54 +0000 (13:26 +0800)]
MDL-52777 tool_usertours: Remove unused template
Jun Pataleta [Fri, 30 Sep 2016 08:18:56 +0000 (16:18 +0800)]
MDL-53832 enrol_lti: Map consumer to tool and handle instance deletion
Jun Pataleta [Fri, 9 Sep 2016 10:06:50 +0000 (18:06 +0800)]
MDL-53832 enrol_lti: Unit tests for tool_provider
Original subtask: MDL-55647.
Jun Pataleta [Fri, 16 Sep 2016 09:39:55 +0000 (17:39 +0800)]
MDL-53832 enrol_lti: Improve provider logic
* onRegister
- Validate returnUrl and consumer object.
- Use moodle_url for the returnURL.
- Set success message on successful registration.
- Reorganise code.
* Constructor
- Remove required params we don't need (Original sub-task: MDL-56035)
* onLaunch
- Validate consumer object.
- Set appropriate values for OK flag and message.
* Import classes.
John Okely [Thu, 15 Sep 2016 08:40:09 +0000 (16:40 +0800)]
MDL-53832 enrol_lti: Allow multiple LTI1 consumers with the same key
John Okely [Tue, 13 Sep 2016 08:32:43 +0000 (16:32 +0800)]
MDL-53832 enrol_lti: Support user images
Original subtask MDL-55718.
John Okely [Fri, 9 Sep 2016 06:28:33 +0000 (14:28 +0800)]
MDL-53832 enrol_lti: Only allow certain consumers for each shared tool
Original subtask: MDL-55753.
John Okely [Tue, 30 Aug 2016 04:03:17 +0000 (12:03 +0800)]
MDL-53832 enrol_lti: Unit test more of helper
John Okely [Tue, 30 Aug 2016 03:24:14 +0000 (11:24 +0800)]
MDL-53832 enrol_lti: Split launch and proxy registration end points
Original subtask: MDL-55752.
John Okely [Fri, 26 Aug 2016 08:05:20 +0000 (08:05 +0000)]
MDL-53832 enrol_lti: Separate tool launch and proxy registration logic
John Okely [Tue, 23 Aug 2016 04:48:42 +0000 (12:48 +0800)]
MDL-53832 enrol_lti: Add language strings and renderers
Jun Pataleta [Mon, 15 Aug 2016 09:34:00 +0000 (17:34 +0800)]
MDL-53832 enrol_lti: Make LTI1 launch URLs work with new library
Original subtask: MDL-55562.
Jun Pataleta [Tue, 23 Aug 2016 09:26:54 +0000 (17:26 +0800)]
MDL-53832 enrol_lti: Unit tests for data_connector
Original subtask: MDL-55529.
Jun Pataleta [Fri, 23 Sep 2016 06:04:30 +0000 (14:04 +0800)]
MDL-53832 enrol_lti: Add data_connector
Original subtask: MDL-55529.
John Okely [Tue, 9 Aug 2016 07:55:04 +0000 (15:55 +0800)]
MDL-53832 enrol_lti: Add LTI2 tables to enrol_lti
John Okely [Fri, 23 Sep 2016 05:46:32 +0000 (13:46 +0800)]
MDL-53832 enrol_lti: Add interface for proxies
John Okely [Fri, 23 Sep 2016 05:43:20 +0000 (13:43 +0800)]
MDL-53832 enrol_lti: Add LTI provider library
David Monllao [Wed, 19 Oct 2016 02:58:21 +0000 (10:58 +0800)]
MDL-52777 usertours: Toothpaste for tabs again
David Monllao [Wed, 19 Oct 2016 02:40:40 +0000 (10:40 +0800)]
MDL-52777 usertours: Replacing tabs by spaces
Also dos2unix to svgs just in case.
David Monllao [Wed, 19 Oct 2016 02:34:12 +0000 (10:34 +0800)]
MDL-52777 usertours: Remove empty styles file
David Monllao [Wed, 19 Oct 2016 01:59:27 +0000 (09:59 +0800)]
Merge branch 'MDL-52777-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Sat, 1 Oct 2016 13:24:29 +0000 (21:24 +0800)]
MDL-52777 tool_usertours: Add the new User Tours plugin
David Monllao [Wed, 19 Oct 2016 01:33:06 +0000 (09:33 +0800)]
Merge branch 'MDL-56218-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2016 20:58:27 +0000 (22:58 +0200)]
MDL-43230 badges: new cap version bump
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
