moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81436 commits 37 branches 540 tags 1.3 GiB
Commit graph

81436 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
c24a410f43 Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-19 15:02:44 +08:00
Andrew Nicols
42bb3f8b66 MDL-52777 tool_usertours: Less strict comparison for tour ID 2016-10-19 14:57:13 +08:00
Ryan Wyllie
4788031edf MDL-56337 message: fix behat for phantomjs 2016-10-19 06:35:12 +00:00
Andrew Nicols
a42a5e21eb MDL-52777 tool_usertours: Remove unused template 2016-10-19 13:26:54 +08:00
Jun Pataleta
6092bbc07a MDL-53832 enrol_lti: Map consumer to tool and handle instance deletion 2016-10-19 11:14:28 +08:00
Jun Pataleta
c314d6ed8e MDL-53832 enrol_lti: Unit tests for tool_provider 
Original subtask: MDL-55647.
 2016-10-19 11:14:27 +08:00
Jun Pataleta
daebcd2801 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.
 2016-10-19 11:14:27 +08:00
John Okely
0b72caebac MDL-53832 enrol_lti: Allow multiple LTI1 consumers with the same key 2016-10-19 11:14:27 +08:00
John Okely
a618c707f2 MDL-53832 enrol_lti: Support user images 
Original subtask MDL-55718.
 2016-10-19 11:14:27 +08:00
John Okely
8e0038f9ea MDL-53832 enrol_lti: Only allow certain consumers for each shared tool 
Original subtask: MDL-55753.
 2016-10-19 11:14:27 +08:00
John Okely
f8307a4b57 MDL-53832 enrol_lti: Unit test more of helper 2016-10-19 11:14:26 +08:00
John Okely
098ee549ee MDL-53832 enrol_lti: Split launch and proxy registration end points 
Original subtask: MDL-55752.
 2016-10-19 11:14:26 +08:00
John Okely
da65fcf027 MDL-53832 enrol_lti: Separate tool launch and proxy registration logic 2016-10-19 11:14:26 +08:00
John Okely
7edf96e265 MDL-53832 enrol_lti: Add language strings and renderers 2016-10-19 11:14:26 +08:00
Jun Pataleta
d49f57c886 MDL-53832 enrol_lti: Make LTI1 launch URLs work with new library 
Original subtask: MDL-55562.
 2016-10-19 11:14:25 +08:00
Jun Pataleta
0d26a2313c MDL-53832 enrol_lti: Unit tests for data_connector 
Original subtask: MDL-55529.
 2016-10-19 11:14:25 +08:00
Jun Pataleta
9191a94143 MDL-53832 enrol_lti: Add data_connector 
Original subtask: MDL-55529.
 2016-10-19 11:14:25 +08:00
John Okely
9161e71515 MDL-53832 enrol_lti: Add LTI2 tables to enrol_lti 2016-10-19 11:14:25 +08:00
John Okely
9a709cd5a5 MDL-53832 enrol_lti: Add interface for proxies 2016-10-19 11:14:24 +08:00
John Okely
a1f3821ee0 MDL-53832 enrol_lti: Add LTI provider library 2016-10-19 11:14:24 +08:00
Ryan Wyllie
65be5b6c11 MDL-56355 message: add keyboard nav to notification page 2016-10-19 03:05:33 +00:00
David Monllao
cfc561d0de MDL-52777 usertours: Toothpaste for tabs again 2016-10-19 10:58:21 +08:00
David Monllao
91aeb866e0 MDL-52777 usertours: Replacing tabs by spaces 
Also dos2unix to svgs just in case.
 2016-10-19 10:40:40 +08:00
David Monllao
2c2dde28f2 MDL-52777 usertours: Remove empty styles file 2016-10-19 10:34:12 +08:00
David Monllao
c66027cf4e Merge branch 'MDL-52777-master' of git://github.com/andrewnicols/moodle 2016-10-19 09:59:27 +08:00
Andrew Nicols
001fc061bd MDL-52777 tool_usertours: Add the new User Tours plugin 2016-10-19 09:48:03 +08:00
David Monllao
27f01529ab Merge branch 'MDL-56218-master' of git://github.com/FMCorz/moodle 2016-10-19 09:33:06 +08:00
Eloy Lafuente (stronk7)
be1ff9a1ee MDL-43230 badges: new cap version bump 2016-10-18 22:58:27 +02:00
Eloy Lafuente (stronk7)
8c88830a43 Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle 2016-10-18 22:35:53 +02:00
Eloy Lafuente (stronk7)
ffe9505d2b Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle 2016-10-18 20:02:22 +02:00
Eloy Lafuente (stronk7)
e74c54ec4d Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:11:51 +02:00
Eloy Lafuente (stronk7)
05e588a056 Merge branch 'MDL-56293-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:08:08 +02:00
Eloy Lafuente (stronk7)
881e611c33 Merge branch 'MDL-53752-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:06:26 +02:00
Eloy Lafuente (stronk7)
3fdbba0e27 Merge branch 'MDL-29774-master-by-sam-wilson' of git://github.com/junpataleta/moodle 2016-10-18 18:26:50 +02:00
Dan Poltawski
876fc28255 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
 2016-10-18 17:19:03 +01:00
Dan Poltawski
a477b761be Merge branch 'master' of https://github.com/rimas-kudelis/moodle 2016-10-18 17:03:21 +01:00
Dan Poltawski
ad2eba780a Merge branch 'MDL-55926-master-3' of git://github.com/ryanwyllie/moodle 2016-10-18 16:31:42 +01:00
Eloy Lafuente (stronk7)
0e51800e5f Merge branch 'MDL-55858-master' of git://github.com/andrewnicols/moodle 2016-10-18 17:00:21 +02:00
Dan Poltawski
55c7a86632 Merge branch 'wip-MDL-55833-master' of git://github.com/marinaglancy/moodle 2016-10-18 15:26:31 +01:00
Dan Poltawski
0022812b71 Merge branch 'MDL-55736-master' of git://github.com/FMCorz/moodle 2016-10-18 13:48:46 +01:00
Dan Poltawski
cfa69ad260 Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle 2016-10-18 13:44:33 +01:00
Dan Poltawski
c0b1f18930 MDL-55924 behat: fix misleading comment 2016-10-18 13:24:08 +01:00
Dan Poltawski
01bc6a35bc Merge branch 'wip-mdl-55924' of https://github.com/rajeshtaneja/moodle 2016-10-18 13:22:56 +01:00
Dan Poltawski
846baba950 Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle 2016-10-18 12:37:32 +01:00
Dan Poltawski
551c7e6c38 Merge branch 'wip-MDL-55087-master' of git://github.com/abgreeve/moodle 2016-10-18 12:32:08 +01:00
Dan Poltawski
d98ab2a585 Merge branch 'MDL-56062-master' of https://github.com/lucisgit/moodle 2016-10-18 12:06:27 +01:00
Dan Poltawski
1bcaff71d8 Merge branch 'MDL-56159_master-phpunit-fix' of git://github.com/dmonllao/moodle 2016-10-18 11:26:18 +01:00
David Monllao
8d92dbd1fc MDL-56159 user: Fix unit test 
The exception that is being thrown changed to moodle_exception
with usernotfullysetup error code.
 2016-10-18 18:24:47 +08:00
Dan Poltawski
c70b9e8451 Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle 2016-10-18 11:24:36 +01:00
Eloy Lafuente (stronk7)
772c7b4733 Merge branch 'MDL-56275-master' of git://github.com/danpoltawski/moodle 2016-10-18 12:16:28 +02:00