mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
82,699 Commits 36 Branches 527 Tags
Commit Graph

22890 Commits

Author SHA1 Message Date
Dan Poltawski
935584aaba MDL-57690 yui: remove the mcore rollup 
This was is pre-loading some modules which are not used in boost:

* Block docking
* Popup Help

The other pre-loaded requirements were used for YUI dialogues and
modals. With time we are moving away from these, so rather than
'pre-loading' we can let the yui loader do its job.
 2017-01-19 08:10:34 +00:00
Dan Poltawski
f745b81201 MDL-57690 output: stop requiring moodle-core-popuphelp on every page 
In boost we are not longer using this module, so lets limit it to
bootstrapbase only
 2017-01-19 08:10:34 +00:00
Andrew Nicols
40566af6d5 Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle 2017-01-18 12:09:20 +08:00
Andrew Nicols
2156bb454c Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle 2017-01-18 07:46:02 +08:00
Eloy Lafuente (stronk7)
d7cee87d24 Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle 2017-01-18 00:00:13 +01:00
Dan Poltawski
419b2f1741 Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle 2017-01-17 10:28:31 +00:00
Dan Poltawski
bb72d31944 Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle 2017-01-17 10:20:08 +00:00
Rajesh Taneja
ada21cb0c8
MDL-57669 behat: Exit with error code if step undefined 2017-01-17 10:30:45 +08:00
Stephen Bourget
9820c67cf9 MDL-42266 Lib: Allow additional max upload file sizes 2017-01-16 10:54:33 -05:00
Dan Poltawski
f8abbbe29e MDL-57490 javascript-static: remove legacy functions 
1) Some previous deprecations are removed to reduce the amount of
 code sent to the client
2) Other very-old functions are also sent to final deprecation

This is more agressive than our standard deprecation process, but with
the nature of this old js it seems the best way forward to reduce the
amount of obsolete js sent to clients.
 2017-01-16 13:23:08 +00:00
Dan Poltawski
97ac35c05f MDL-57488 js: remove M.util.focus_login_form/error 
These are replaced by some simple jquery instead.
 2017-01-15 20:42:35 +00:00
David Bogner
726adbc22a MDL-57374 editor: Pasting plain text in Atto removes all styles/classes 2017-01-12 18:01:30 +01:00
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
sam marshall
66234de24c MDL-57515 Resource: 'not very efficient' with a large number of files 
Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)
 2017-01-10 17:43:46 +00:00
Eloy Lafuente (stronk7)
96733b06d6 Merge branch 'MDL-57282-master' of https://github.com/xow/moodle 2017-01-10 12:38:14 +01:00
Dan Poltawski
1975dcf25c Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle 2017-01-09 10:51:23 +00:00
Dan Poltawski
fc893bc42d Merge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle 2017-01-09 10:23:11 +00:00
Dan Poltawski
66677b7102 Merge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle 2017-01-09 09:58:57 +00:00
Dan Poltawski
5445df2957 Merge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle 2017-01-09 09:42:27 +00:00
godric
4c4b966a92 MDL-40132 lib: Using compare rule results in fatal error. 
In getValidationScript function variable $element can be an array or object.
Function attempt get non-existing attributes.
To avoid this we should check before accessing.
 2017-01-07 09:40:27 +03:00
John Okely
b7c822a546 MDL-57282 behat: Deprecate I go to X in the course gradebook 2017-01-06 13:47:19 +08:00
Rajesh Taneja
484503da62
MDL-56211 behat: Add suite name to faildump path 
If suite is not default then add suite name
to end of faildump file name
 2017-01-06 09:18:52 +08:00
Dan Poltawski
7716be5ae8 Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle 2017-01-05 10:09:17 +00:00
Rajesh Taneja
1024f6d1ec
MDL-57531 behat: Set noreplyaddress to valid address 
noreplyaddress should be a valid address, else
it will not be saved. For behat we don't send
email, so set it to noreply@example.com, to
avoid failing validation on localhost
 2017-01-05 14:40:16 +08:00
Helen Foster
442879042c MDL-57563 lang: Merge English strings from the en_fix language pack 2017-01-04 22:03:08 +01:00
Dan Poltawski
b6f5e57e45 Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle 2017-01-04 13:29:10 +00:00
David Mudrák
7620746f67 MDL-57531 mail: Make validate_email return actual boolean as expected 
It was discovered by unit tests that the return value is not a real
boolean as was intuitively expected and documented. To avoid potential
issues with the truthyness in the future, we explicitly cast the return
value to boolean now.
 2017-01-04 13:16:07 +01:00
David Mudrák
61367eb639 MDL-57531 mail: Validate the sender's email address 
The patch adds validation for the noreplyaddress setting variable, for
the explicit $replyto parameter and for the sender's email. In case of
misconfigured noreplyaddress setting, it falls back to the default
noreply address value. In case of invalid email in the user's record,
the email is not sent.

The patch also adds unit test for the value returned by the function
generate_email_processing_address() so that it can be considered as a
valid email, too.

This is supposed to significantly minimise the risk of exploiting the
vulnerability in PHPMailer's Sender field.
 2017-01-04 12:35:19 +01:00
Eloy Lafuente (stronk7)
41af8a5f90 Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle 2017-01-04 11:34:01 +00:00
David Monllao
36bbf71a65 MDL-57338 templates: Fix modal_cancel template name 2017-01-04 11:33:59 +00:00
Ankit Agarwal
a76b0b8b85 MDL-56992 core_scss: Don't allow invalid files to be included 
We allow only .scss files so allow files to be included only and only if they end in .scss and they exist on server under theme directory.
 2017-01-04 11:33:57 +00:00
Ankit Agarwal
c728b45904 MDL-57192 dml: Temporarily disable query logging during setup 2017-01-03 17:24:21 +05:30
Ankit Agarwal
c14fe2cb03 MDL-57192 dml: Support temporarily disabling query logs during setup 2017-01-03 17:24:21 +05:30
Eloy Lafuente (stronk7)
0e5205d36c Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle 2017-01-03 02:34:58 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Eloy Lafuente (stronk7)
2a3341c2dc Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle 2017-01-02 19:37:17 +01:00
Eloy Lafuente (stronk7)
e7e1308cd4 Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle 2017-01-02 16:42:41 +01:00
Dan Poltawski
589449b81e Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle 2017-01-02 12:15:01 +00:00
Dan Poltawski
6dbe175454 Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle 2017-01-02 11:46:44 +00:00
David Monllao
7eeb375380 Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle 2016-12-29 10:44:01 +01:00
Dan Poltawski
9f85876247 MDL-57338 templates: fix missing example variables 
From Davids review, thanks
 2016-12-29 08:03:47 +00:00
David Monllao
125fa61a15 MDL-57471 forms: Removing unresolved conflict line 2016-12-29 08:54:36 +01:00
David Monllao
3655a459b4 Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle 2016-12-29 08:43:37 +01:00
David Monllao
7454d5fb37 Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle 2016-12-28 21:19:01 +00:00
Dan Poltawski
79be02bf8d Merge branch 'MDL-57417-master' of https://github.com/snake/moodle 2016-12-28 21:19:00 +00:00
David Monllao
564630322c Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle 2016-12-28 12:22:52 +01:00
David Monllao
cc31be4ffc Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle 2016-12-28 11:45:34 +01:00
Dan Poltawski
66b68d631d Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle 2016-12-28 10:32:50 +00:00
Juan Leyva
879a8f56c9 MDL-57395 course: New Web Service core_course_get_updates_since 2016-12-28 11:24:40 +01:00
David Monllao
f32ff507e2 Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle 2016-12-28 10:58:13 +01:00