moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82551 commits 37 branches 540 tags 1.3 GiB
Commit graph

962 commits

Author SHA1 Message Date
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
ef9a1a2aff Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle 2016-12-19 15:05:14 +01:00
Rafal Domagalski
43bcc4b4ad MDL-52366 themes: check for templates in themedir 2016-12-16 13:32:08 +01:00
Rajesh Taneja
79cb27179a
MDL-56642 dataformat: Fixed method_exits parameters 2016-12-08 07:20:21 +08:00
Marina Glancy
1491f21554 MDL-56642 dataformat: set temp dir 
Thanks to Chien Wen-Chang for proposing a patch
 2016-12-07 09:30:14 +08:00
Michael Aherne
23b9e2a16d MDL-56320 webservice: Allow uninstall of unused plugins 2016-12-05 12:56:55 +00:00
Simey Lameze
7d17256a75 MDL-57194 core_charts: Allow colors to be overridden by setting 2016-12-01 14:44:00 +08:00
Dan Poltawski
39f621305d Merge branch 'MDL-57134-master' of git://github.com/lameze/moodle 2016-11-25 12:35:17 +00:00
Jake Dallimore
d714aeb4f5 MDL-57126 core: add 'scss' to list of core filetypes. 
This allows filetype restrictions to work when uploading additional
preset files on the Boost admin settings page.
 2016-11-25 07:53:59 +08:00
Simey Lameze
539de849cd MDL-57134 core_badges: add missing badgeslib.php include 2016-11-24 16:45:17 +08:00
David Monllao
900a2c554e Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle 2016-11-16 05:31:55 +08:00
Matteo Scaramuccia
ade30c673c MDL-56917 core_upgrade: Do not use the raw version to check cURL caps. 
Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, 87954ef9ca
 2016-11-15 21:50:07 +01:00
Andrew Nicols
7afc76fbd6 Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle 2016-11-15 09:07:37 +00:00
Andrew Nicols
2d45ac279d Merge branch 'MDL-56823' of git://github.com/aolley/moodle 2016-11-15 09:07:36 +00:00
Damyon Wiese
204413187e MDL-56952 plugininfo: You can uninstall theme_base 2016-11-15 08:55:41 +08:00
Dan Poltawski
55e54953a4 Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle 2016-11-14 13:09:48 +00:00
Eloy Lafuente (stronk7)
dd24216a3b Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle 2016-11-14 12:04:25 +01:00
David Mudrák
6b6a2ec439 MDL-56916 docs: Fix documentation of the normalize_component return 2016-11-12 10:45:29 +01:00
Andrew Nicols
6b7b3e59f2 Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle 2016-11-11 11:53:41 +08:00
Michael Aherne
51c6d25b3b MDL-56880 webservices: Fix documentation of get_enabled_plugins() 2016-11-10 16:18:06 +00:00
Nicholas Hoobin
b86c685075 MDL-56417 session: Respect the return value of ignore_timeout_hook. 2016-11-10 14:24:24 +08:00
Adam Olley
d456bd42c3 MDL-56823 session: redis sessions don't honour $CFG->sessiontimeout 
The redis session handler doesn't use the sessiontimeout config setting
to determine session lifetime.

It has a lock expiry, which is set to 7200 (or a config setting) that is
used to determine how long a lock is held onto, but that should be
distinct from the session timeout.
 2016-11-10 10:30:04 +10:30
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
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
Marina Glancy
737638d950 MDL-38158 media: mpeg is not html5 supported format 2016-11-07 11:44:59 +08:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Dan Poltawski
4d27d62d08 Merge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle 2016-11-02 14:00:29 +00:00
Andrew Nicols
c6ae02c184 Merge branch 'MDL-48468' of https://github.com/mr-russ/moodle 2016-11-02 10:13:42 +08:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Russell Smith
68b1e13094 MDL-48468 cache: Import Redis cachestore 
This code was originally taken from; https://github.com/durana/moodle-cachestore_redis
Special thanks to Mark Nielsen and Adam Durana for their work on this.

Since the original import;
- Mode session support has been added.
- Some cleanup of names has been made.
- Data guarantee and references support was added.
 2016-10-30 13:34:43 +11:00
Adrian Greeve
159c2c91be MDL-55927 auth_radius: Move to third party plugin. 2016-10-28 14:35:54 +08:00
Adrian Greeve
9715f61a26 MDL-44467 lib: Fix return path to noreply. 
Added code to show emails from users on controlled domains.
Moved admin settings from message_email to admin.
 2016-10-28 13:27:00 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Eloy Lafuente (stronk7)
a29bcf7819 MDL-47162 core_message: debug whenever courseid is missing 
Instead of silently defaulting to SITEID when courseid (coming
from message_send()/\core\message\manager::send_message()) is missing,
now a debugging message is shown to allow developers to fix their
messages to, always, include courseid.

Raw creation of events via message_sent::create() missing other[courseid]
leads to coding exception since now (there shouldn't be any legacy use, as far as
they are always created via create_from_ids() when sending a message.

Updated upgrade.txt notes a little bit, added references the 3.6 final
deprecation issue (MDL-55449) and covered with unit tests.
 2016-10-28 00:30:02 +02:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Dan Poltawski
1810eb1bf8 Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle" 
This reverts commit aaa2788e42, reversing
changes made to 80b74762c9.
 2016-10-27 09:59:38 +01:00
Dan Poltawski
e376b4bd64 Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle 2016-10-26 09:57:50 +01:00
Adrian Greeve
020c98e373 MDL-56334 libraries: Addition of domain checker. 
Added a function for checking if a domain is allowed
against a list of domains that could contain wildcards.
 2016-10-26 15:51:32 +08:00
Jake Dallimore
6d6e36923b MDL-56334 libraries: Add new internet protocol library to core 
New library providing utilities for IP addresses, DNS and other
internet-protocol-related information.
 2016-10-26 15:49:03 +08:00
Andrew Nicols
8d3c33c693 Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle 2016-10-26 08:19:23 +08:00
Dan Poltawski
7af5ad97c1 MDL-46942 events: fix naming of other param 
originalcourseid matches coding style
 2016-10-25 20:18:35 +01:00
Dan Poltawski
7e670910ed Merge branch 'MDL-46942-added-original-course' of https://github.com/jmalmsten-panopto/moodle 2016-10-25 20:15:55 +01:00
Dan Poltawski
1a2497c3c2 Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle 2016-10-25 06:38:13 +01:00
jmalmsten-panopto
3480411e0d MDL-46942 core_backup: added original course id to restore event 2016-10-24 09:01:34 -07: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
Luke Carrier
14d6c1cf79 MDL-55902 my: Add additional information to dashboard reset events 
* Add $private and $pagetype information to the 'other' parameter of
the dashboard(s) reset events.
 2016-10-24 11:03:10 +08:00
Ruslan Kabalin
4cc1b5bc0c MDL-50888 antivirus: Move post-scan logic to manager. 
In the initial implementation, infected file cleanup and exception throwing
was done at the plugin level. This is somewhat incorrect from plugin
responsibility perspective. The patch moves cleanup and exception logic to
the manager. Antivirus plugin responsibility is limited to perform scanning
and respond with one of the result statuses defined in the
\core\antivirus\scanner.
 2016-10-21 11:48:49 +01: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