mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity
81,065 Commits 36 Branches 529 Tags
Commit Graph

81065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
49b78f21b4 Merge branch 'MDL-56533-master' of git://github.com/crazyserver/moodle 2016-10-24 12:07:40 +08:00
David Monllao
aaa2788e42 Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:56:06 +08:00
Andrew Nicols
c823bfee62 MDL-56129 core: Set a timeout on the session cookie 
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.

In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.

Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.

This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
 2016-10-24 11:47:06 +08:00
David Monllao
80b74762c9 DML-53048 forms: Remove conflict resultion remaining bit 
Change wrong alternative references as well.
 2016-10-24 11:16:53 +08:00
David Monllao
8f68e0343a Merge branch 'MDL-53048-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:12:25 +08:00
David Monllao
055cc7d037 Merge branch 'MDL-56252-master' of git://github.com/ryanwyllie/moodle 2016-10-24 10:25:32 +08:00
Andrew Nicols
ab00bf59a5 Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle 2016-10-24 10:11:20 +08:00
David Monllao
40e342718b Merge branch 'MDL-56380_master' of git://github.com/markn86/moodle 2016-10-24 10:04:45 +08:00
Andrew Nicols
c071a83c94 Merge branch 'MDL-56355-master' of git://github.com/ryanwyllie/moodle 2016-10-24 09:47:43 +08:00
David Monllao
8cf4139074 Merge branch 'MDL-56090_master' of git://github.com/markn86/moodle 2016-10-24 09:35:28 +08:00
Andrew Nicols
ca25005c69 MDL-53048 form: Rewrite passwordunmask 
This version:
* should work with the Behat Goutte driver
* should not suffer from password autofill anxiety
* should allow unmasking (and masking) of a password
* should allow editing of passwords in either masked, or unmasked form

AMOS BEGIN
 MOV [revealpassword,core_form],[passwordunmaskrevealhint,core_form]
AMOS END
 2016-10-24 09:24:39 +08:00
Andrew Nicols
ac157b0bbe MDL-53048 forms: Deprecate prevent_form_autofill_password 2016-10-24 08:19:44 +08:00
Eloy Lafuente (stronk7)
bf6cfca285 Merge branch 'MDL-56529-master' of git://github.com/junpataleta/moodle 2016-10-21 13:03:56 +02:00
Pau Ferrer Ocaña
28ff87bec1 MDL-56533 course: Add outcome scale information on get_course_module WS 2016-10-21 10:37:44 +02:00
Mark Nelson
1f64514def MDL-56090 core_message: added API unit tests 2016-10-21 16:22:03 +08:00
Jun Pataleta
0766dd669b 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()
 2016-10-21 12:34:00 +08:00
Eloy Lafuente (stronk7)
919b9dfabd weekly release 3.2dev 2016-10-20 17:52:33 +02:00
Eloy Lafuente (stronk7)
42b5234209 NOBUG: Fixed file access permissions 2016-10-20 17:52:32 +02:00
Eloy Lafuente (stronk7)
f8e7143fca Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-20 17:52:29 +02:00
Mark Nelson
fcc13c6527 MDL-56380 core_message: prevent default behaviour for links 2016-10-20 16:36:59 +08:00
Dan Poltawski
9876856dca Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 08:02:08 +01:00
Andrew Nicols
31c3b7a2e1 MDL-52777 tool_usertours: Stop testing pending upgrades 2016-10-20 14:51:57 +08:00
Andrew Nicols
aea13e1c26 MDL-52777 tool_usertours: Fix matching tour test 2016-10-20 14:51:57 +08:00
Ryan Wyllie
54d83992b4 MDL-56252 message: clean message text in message area 
Remove the HTML tags from any message in the message area when updating
the last message on the contact otherwise the styling breaks and also
allows <script> tags to be added to the page.
 2016-10-20 06:49:26 +00:00
David Monllao
c6509ee31d Merge branch 'MDL-52777-master-bug' of github.com:andrewnicols/moodle 2016-10-20 14:09:57 +08:00
Andrew Nicols
55dba8058f MDL-52777 tool_usertours: Only return tours with steps 2016-10-20 13:44:18 +08:00
Frédéric Massart
a89cf23744 MDL-56341 mustache: JS engines handles strings wrapped in quote 
Prior to the patch the strings wrapped as the following one
where not found and replaced when rendering the template via Javascript

{{#quote}}{{#str}}string,component{{/str}}{{/quote}}
 2016-10-20 12:13:42 +08:00
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
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