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

82698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
e0d1efd896 Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle 2017-01-05 06:51:54 +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
David Mudrák
1882e6ecac MDL-57563 lang: Use the new newsitemsnumber wording in behat 2017-01-04 22:09:44 +01:00
Helen Foster
442879042c MDL-57563 lang: Merge English strings from the en_fix language pack 2017-01-04 22:03:08 +01:00
AMOS bot
47b0dc1f3b Automatically generated installer lang files 2017-01-05 00:04:57 +08: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
David Mudrák
066ec13585 MDL-57531 mail: Do not let admins set invalid email addresses 
The noreply and support emails should always be valid.
 2017-01-04 12:34:29 +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 Mudrák
1af801be98 MDL-56225 mod_forum: Fix inability to edit attachments 
The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.

There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.
 2017-01-04 11:34:01 +00:00
David Monllao
9afc02742b Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-04 11:34:00 +00:00
David Monllao
36bbf71a65 MDL-57338 templates: Fix modal_cancel template name 2017-01-04 11:33:59 +00:00
Rajesh Taneja
af1b9b6924 MDL-57536 availability: Fixed css for clean theme 2017-01-04 11:33:59 +00:00
Dan Poltawski
c3e9e8bc3c Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle 2017-01-04 11:33:58 +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
Andrew Nicols
6528ec3505 MDL-56225 mod_forum: Remove unnecessary attributes from update 2017-01-04 11:33:57 +00:00
Dan Marsden
e68cdceee3 MDL-49557 mod_scorm: optionally strip quotes. 2017-01-04 15:43:46 +13: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
Dan Poltawski
2c814d2c5e Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle 2017-01-03 08:16:22 +00:00
Rajesh Taneja
f2e6dcba51
MDL-52168 behat: Select iframe in which text needs to be checked 2017-01-03 15:14:04 +08:00
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
Rajesh Taneja
e989ff2d34
MDL-56519 behat: Re-organize rules matching order 
re-ordered rules to match gherkin-lint readme
https://github.com/vsiakka/gherkin-lint#available-rules
 2017-01-03 09:12:54 +08:00
Dan Poltawski
8b02e2d98c
MDL-56519 behat: Lint gherkin files 2017-01-03 09:12:54 +08:00
Rajesh Taneja
d15a44d6fb
MDL-55042 phpunit: Get sorted sections 
Sometimes db doesn't return records in order
So enusre it is in order so that last record
doesn't have section equal 0. As section 0
can't be deleted.
 2017-01-03 06:52:03 +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)
06f33c6a86 Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle 2017-01-02 18:59:16 +01:00
Juan Leyva
91fff3914b MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS 2017-01-02 18:56:02 +01:00
Juan Leyva
5316e716e5 MDL-57536 availability: Document required selectors changes 
MDL-55839 Introduced some changes in CSS selectors used by the form.js
file.

This caused contributed plugins to not work (javascript stop working)
when editing a module.
 2017-01-02 18:50:54 +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
00e741af48 Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-02 12:35:11 +00:00
Dan Poltawski
241473ce2e Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle 2017-01-02 12:20:34 +00: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
Dan Poltawski
25a222734e Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle 2017-01-02 11:16:27 +00:00
Dan Poltawski
5fd78ba412 MDL-57532 calendar: tidy up button grouping 2017-01-02 10:44:35 +00:00
Dan Poltawski
77e1c18727 Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle 2017-01-02 10:34:58 +00:00
David Monllao
f3b3901822 Merge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle 2016-12-30 09:59:45 +01:00
David Monllao
6229657584 MDL-56926 theme_boost: Restore filepicker's filename and icons original spacing 2016-12-30 09:39:38 +01:00
Nadav Kavalerchik
2c8dd8e312 MDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides 2016-12-30 09:38:11 +01:00
AMOS bot
26870bb19c Automatically generated installer lang files 2016-12-30 00:05:07 +08:00
Dan Poltawski
4053aa77fa Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle 2016-12-29 11:50:50 +00:00
Dan Poltawski
5d970e1aa0 Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle 2016-12-29 11:46:47 +00:00
Pau Ferrer Ocaña
7180cdc7b5 MDL-57512 categories: Use maxcategorydepth only when getting all cats 2016-12-29 11:30:57 +01: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