mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 18:03:19 +02:00
Code Issues Projects Releases Wiki Activity
81,063 Commits 36 Branches 530 Tags
Commit Graph

22422 Commits

Author SHA1 Message Date
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
Andrew Nicols
ab00bf59a5 Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle 2016-10-24 10:11:20 +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)
42b5234209 NOBUG: Fixed file access permissions 2016-10-20 17:52:32 +02: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
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
Jun Pataleta
c314d6ed8e MDL-53832 enrol_lti: Unit tests for tool_provider 
Original subtask: MDL-55647.
 2016-10-19 11:14:27 +08:00
John Okely
a1f3821ee0 MDL-53832 enrol_lti: Add LTI provider library 2016-10-19 11:14:24 +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
Eloy Lafuente (stronk7)
8c88830a43 Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle 2016-10-18 22:35:53 +02:00
Dan Poltawski
ad2eba780a Merge branch 'MDL-55926-master-3' of git://github.com/ryanwyllie/moodle 2016-10-18 16:31:42 +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
David Monllao
5f02fd5072 Merge branch 'MDL-56159-master' of git://github.com/jleyva/moodle 2016-10-18 17:27:48 +08:00
Eloy Lafuente (stronk7)
8e13213427 Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle 2016-10-18 11:21:31 +02:00
Juan Leyva
80e0f0b85b 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.
 2016-10-18 09:44:09 +01:00
Eloy Lafuente (stronk7)
2017a60e11 MDL-55175 course: Fix typo & parenthesis 2016-10-18 10:12:30 +02:00
Eloy Lafuente (stronk7)
1f89aba18f Merge branch 'MDL-55175-master-2' of git://github.com/andrewnicols/moodle 2016-10-18 10:12:29 +02:00
David Monllao
326d861978 MDL-45639 ws: Remove trailing whitespace 2016-10-18 08:40:25 +08:00
David Monllao
4455ff2cba Merge branch 'MDL-45639-master' of git://github.com/jleyva/moodle 2016-10-18 08:26:25 +08:00
Ryan Wyllie
f05c1013de MDL-55926 message: add behat tests for message ui 2016-10-18 00:26:21 +00:00
Eloy Lafuente (stronk7)
7b7dbac4e8 Merge branch 'wip-mdl-56369' of https://github.com/rajeshtaneja/moodle 2016-10-18 01:32:58 +02:00
Eloy Lafuente (stronk7)
aa46cb9503 Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle 2016-10-17 18:42:14 +02:00
Eloy Lafuente (stronk7)
cfe55553e0 Merge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle 2016-10-17 18:12:33 +02:00
Dan Poltawski
2ee939fb19 Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle 2016-10-17 11:01:27 +01:00
Andrew Nicols
f0f4c1939c MDL-55175 course: Begin deprecation process for pring_log_* 2016-10-17 11:08:20 +08:00
Adrian Greeve
f34d7af0ae MDL-55087 lib: Update to htmlpurifier lib. 2016-10-17 08:43:41 +08:00
Adrian Greeve
b36b997b7f MDL-55087 lib: Update htmlpurifier to v4.8.0. 2016-10-17 08:43:41 +08:00
Juan Leyva
961c95499e 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
 2016-10-14 12:32:37 +01:00
Juan Leyva
69cbe35943 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.
 2016-10-14 12:32:30 +01:00
Dan Poltawski
0a51a20928 MDL-55510 upgrade: remove repository_alfresco config 
This was missing from MDL-49533 and caused a complaint about alfresco
on every upgrade.
 2016-10-14 09:41:31 +01:00
Dan Poltawski
f60c7eae73 MDL-56436 mustache: update import docs 2016-10-14 08:31:23 +01:00
acorbier
1b372a77a5
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
 2016-10-14 13:22:04 +08:00
Eloy Lafuente (stronk7)
1c56029fa4 Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle 2016-10-13 19:35:48 +02:00
Rajesh Taneja
c5a566dc15 MDL-55522 behat: Commented failing transformations 
- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959
 2016-10-13 19:35:45 +02:00
Cameron Ball
3aa8696ce6 MDL-56095 output: Properly set prototype on custom event for IE 2016-10-13 19:32:09 +02:00
Juan Leyva
e86f0cb4a1 MDL-55393 message: New WS get_user_notification_preferences 2016-10-13 19:32:06 +02:00
Juan Leyva
53522c6e38 MDL-55393 message: Add some external functions to mobile service 2016-10-13 19:32:05 +02:00
Eloy Lafuente (stronk7)
c405d31bef Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle 2016-10-13 19:32:05 +02:00
Eloy Lafuente (stronk7)
403b817857 Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:32:04 +02:00
Marina Glancy
62a3c42947 MDL-56110 forms: debug message for php 7.1 compat 
Follow up for MDL-55123
 2016-10-13 09:18:34 +08:00
Matt Davidson
b7374faca6 MDL-43230 badges: manually revoke awarded badges 
A user can be manually awarded a badge, but if given by mistake an
awarded badge cannot be removed.
 2016-10-12 05:06:38 +00:00
David Monllao
b805d3f8ef MDL-56057 search: Fix incorrectly reported no enabled search areas 
Also improved performance caching enabled search areas and
all search areas at the same time.
 2016-10-12 08:30:23 +08:00