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

22618 Commits

Author SHA1 Message Date
Dan Poltawski
e9eec33560 Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle 2016-11-11 10:22:20 +00:00
Andrew Nicols
9fa6d4e04e Merge branch 'MDL-55121-master' of git://github.com/lameze/moodle 2016-11-11 15:12:50 +08:00
Andrew Nicols
ea10a0319b MDL-56602 core: Lock themerev during upgrade 
This also changes install to use a fixed themerev.
 2016-11-11 14:15:00 +08:00
Simey Lameze
51f3693cdb MDL-55121 environment: check for unsuported php version 7.1 2016-11-11 12:37:07 +08:00
Andrew Nicols
6b7b3e59f2 Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle 2016-11-11 11:53:41 +08:00
Dan Poltawski
d5d6eda93c Merge branch 'MDL-55777-master' of git://github.com/ankitagarwal/moodle 2016-11-10 13:46:10 +00:00
Dan Poltawski
f670b39e69 Merge branch 'MDL-56602-master-2' of git://github.com/andrewnicols/moodle 2016-11-10 11:26:14 +00:00
Juan Leyva
1e17258b66 MDL-56268 webservice: Format backtrace to avoid display private data 2016-11-10 16:15:31 +08:00
Dan Poltawski
da55f3582b Merge branch 'MDL-56705-master' of git://github.com/damyon/moodle 2016-11-10 08:03:37 +00:00
Damyon Wiese
e7bda18de6 MDL-56705 forms: Use [] for multiple values 
Some "select" based form elements are not inheriting directly from
MoodleQuickForm_select - so did not have the adjustment to the form
field name that allows multiple values. I moved this fix to the
templateable trait so all the form fields get this fix.
 2016-11-10 14:57:58 +08:00
Nicholas Hoobin
b86c685075 MDL-56417 session: Respect the return value of ignore_timeout_hook. 2016-11-10 14:24:24 +08:00
David Monllao
096a418d01 Merge branch 'MDL-56715-master' of https://github.com/xow/moodle 2016-11-10 13:19:01 +08:00
Ankit Agarwal
f2330472f0 MDL-55777 installation: Check libcurl version on install 2016-11-10 10:16:19 +05:30
John Okely
eea9f10900 MDL-56715 form: Allow password unmask fields to be cleared in FF49 2016-11-10 11:22:59 +08:00
Andrew Nicols
9d75a519f3 MDL-56602 themes: Use version number as base themerev 2016-11-10 08:02:31 +08:00
Dan Poltawski
793fe29014 Merge branch 'MDL-48498-master-iv6-undefinedfix' of https://github.com/snake/moodle 2016-11-09 12:16:03 +00:00
Andrew Nicols
16f9660cfe Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle 2016-11-09 11:59:02 +08:00
Jake Dallimore
c02778ac30 MDL-48498 admin: fix get_setting return for mixedhostiplist setting 2016-11-09 11:32:58 +08:00
Andrew Nicols
cfa4b26231 Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle 2016-11-09 11:27:57 +08:00
Simey Lameze
cff1f90adf MDL-56792 core_charts: clean html content from title and labels 
This commit add cleanData() and call it from all places that has labels or title
to guarantee that html content will not be printed on the chart.
 2016-11-09 10:41:12 +08:00
Andrew Nicols
43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +08:00
Eloy Lafuente (stronk7)
6c5ee657a7 Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle 2016-11-09 02:11:55 +01:00
David Monllao
0cbfb7ff2a Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle 2016-11-09 08:36:36 +08:00
Dan Poltawski
e20c8ddc80 Merge branch 'MDL-48498-master-iv6' of https://github.com/snake/moodle 2016-11-08 17:51:17 +00:00
Rajesh Taneja
e4c98de168
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 18:06:09 +08:00
Juan Leyva
9d92a3a6ba MDL-56607 settings: Remove Mobile settings from WS overview 2016-11-08 09:52:16 +00:00
Ankit Agarwal
20ab51fdbc MDL-56409 messages: Save one db query per page load 2016-11-08 12:50:30 +05:30
Jake Dallimore
605bab84ce MDL-48498 core_files: Add security helper to curl class 
Allow injection of security_helper objects into curl, but default
to a core helper tied to http security settings values.
 2016-11-08 15:11:15 +08:00
Jake Dallimore
f6d9efefaa MDL-48498 core_files: curl_security_helper_base and implementation 
Base class and core implementation providing a means to check URLs
against the curl security admin settings entries.
 2016-11-08 15:11:15 +08:00
Jake Dallimore
067268942c MDL-48498 admin: new setting types for curl host/port restrictions 
Two new classes in lib/adminlib. One providing validation for a
newline-delimited textarea supporting domain names, domain wildcards,
IPv4/IPv6 addresses and IPv4/IPv6 ranges. The second providing
validation for a newline-delimited textarea of port numbers.
 2016-11-08 15:10:35 +08:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Damyon Wiese
9280f62e38 MDL-56196 mod_lti: Fix popups and secret form in boost 2016-11-08 14:27:26 +08:00
Andrew Nicols
3e85e02a98 Merge branch 'MDL-55992-master' of git://github.com/jleyva/moodle 2016-11-08 13:41:22 +08:00
Andrew Nicols
11361f35be MDL-56737 externallib: Fetch token after inserting 2016-11-08 12:45:57 +08:00
Damyon Wiese
aad8c7167f MDL-56561 admin: Style admin page listing entire admin tree 
It was an unstyled list of links. This changes it to tabs with sub-headings.
 2016-11-08 11:04:10 +08:00
Andrew Nicols
f4e203209d Merge branch 'MDL-54751_master-fix-cron-user' of git://github.com/dmonllao/moodle 2016-11-08 10:01:04 +08:00
David Monllao
d0cccb4fdb Merge branch 'MDL-53718' of git://github.com/aolley/moodle 2016-11-08 09:59:31 +08:00
David Monllao
44eb1490c4 MDL-54751 course: Set adhoc task user 
We should complete the deletion process using the same
user that started it.

Added a new param to loginas() to prevent the event to be generated as
there is no need to generate an new event for that as the user didn't
explicitly loginas again.
 2016-11-08 09:45:07 +08:00
Eloy Lafuente (stronk7)
a584a403cd Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle 2016-11-07 16:19:06 +01:00
Andrew Nicols
f1b018f511 Merge branch 'MDL-55215-master-fix2' of http://github.com/damyon/moodle 2016-11-07 15:01:46 +08:00
David Monllao
5ffd3f3309 Merge branch 'MDL-54751-master-gradeitemfix' of git://github.com/snake/moodle 2016-11-07 14:43:23 +08:00
Jake Dallimore
a9ac13885c MDL-54751 core_grade: Fix missing require_once in grade_item get_name 2016-11-07 14:35:16 +08:00
Damyon Wiese
737b54fe9e MDL-55215 lesson: JS is required for some lesson behats 
Lesson is using the searchselector which only supports JS - so some
tests need javascript tags.

Also fixed support for filling a passwordunmask field with JS enabled by
id.
 2016-11-07 14:23:46 +08:00
David Monllao
d7480befdd Merge branch 'wip-MDL-38158-fix3' of https://github.com/marinaglancy/moodle 2016-11-07 14:19:15 +08:00
Adam Olley
b4846b88d9 MDL-53718 badges: Dont display course badges when disabled 2016-11-07 15:56:26 +10:30
Andrew Nicols
a2c0528802 Merge branch 'MDL-56737-master' of git://github.com/jleyva/moodle 2016-11-07 13:25:41 +08:00
Marina Glancy
fbb36ed1e6 MDL-38158 media: some players do not want fallback to other players 
there is already logic to determine whether html5 is supported;
otherwise we may end up with nested <audio> or <video> tags
 2016-11-07 11:55:05 +08:00
Marina Glancy
737638d950 MDL-38158 media: mpeg is not html5 supported format 2016-11-07 11:44:59 +08:00
Andrew Nicols
235a80b2d5 Merge branch 'MDL-55215-master-fix1' of http://github.com/damyon/moodle 2016-11-07 11:39:45 +08:00