mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
81,195 Commits 36 Branches 527 Tags
717845b52d
Commit Graph

81195 Commits

Author SHA1 Message Date
David Monllao
1b07e80edf Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 11:50:32 +08:00
David Monllao
664b637101 Merge branch 'wip-mdl-55926' of https://github.com/rajeshtaneja/moodle 2016-10-20 11:48:53 +08:00
Rajesh Taneja
48cf062595
MDL-55926 behat: Fixed undefined steps 2016-10-20 11:26:27 +08:00
Andrew Nicols
c4d5fb53ce 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.
 2016-10-20 11:16:54 +08:00
David Monllao
04ec8f6ef8 Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 10:09:28 +08:00
Andrew Nicols
a8dded9bfc MDL-52777 tool_usertours: Correct & to && in test 2016-10-20 09:54:26 +08:00
Eloy Lafuente (stronk7)
ed971b90eb Merge branch 'MDL-53832-master-review-fixes' of https://github.com/junpataleta/moodle 2016-10-20 02:25:59 +02:00
Dan Poltawski
2d13900f6d Merge branch 'MDL-55823_master' of git://github.com/markn86/moodle 2016-10-19 10:47:35 +01:00
Damyon Wiese
058f2fb68e MDL-56156 theme_boost: enrol_users filter form styles 
Allow wrapping any mform in a "form-inline" div to make it a responsive inline form.
Use this for the enrol users filter for and get rid of a good chunk of custom styles.
 2016-10-19 17:10:22 +08:00
Mark Nelson
6aa019682c MDL-55823 core_message: added WS unit tests 2016-10-19 17:07:58 +08:00
Jun Pataleta
b75d0f0de2 MDL-53832 enrol_lti: Update codes to use the new DB field names 2016-10-19 17:01:34 +08:00
Jun Pataleta
fa015abf7b MDL-53832 enrol_lti: Update data_connector to use the new DB field names 2016-10-19 17:01:30 +08:00
Jun Pataleta
d1e85a0045 MDL-53832 enrol_lti: Make DB column names more moodle-ish 2016-10-19 17:01:22 +08:00
Andrew Nicols
68855baecd MDL-52777 tool_usertours: Prepare target data when displaying form 2016-10-19 15:40:53 +08:00
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