88471 Commits

Author SHA1 Message Date
Andrew Nicols
53ea0e2ccf Merge branch 'patch-2' of https://github.com/do-you-even-curl/moodle 2018-04-16 08:04:32 +08:00
Tim Schroeder
1480277cfa MDL-60681 lib/tablelib.php: Make flexible_table class better extendable
Previously the member functions get_initial_first and get_initial_last of flexible_table were public but deprecated due to being no
longer used. Now they are used by print_initials_bar and made protected. That allows classes deriving from flexible_table to access
the first and last name initials without having to use deprecated methods.
2018-04-13 16:52:52 +02:00
Andrew Nicols
1c406559b8 Merge branch 'MDL-60848_master' of https://github.com/markn86/moodle 2018-04-13 13:54:24 +08:00
Mark Nelson
e41a56192a MDL-60848 atto_recordrtc: removed never shown HTML and string 2018-04-13 13:46:53 +08:00
Mark Nelson
44946baf04 MDL-60848 core: added instructions on how to update adapter.js 2018-04-13 12:59:24 +08:00
Mark Nelson
77e4535fd9 MDL-60848 atto_recordrtc: implemented privacy provider 2018-04-13 12:59:24 +08:00
Mark Nelson
c8520ca45f MDL-60848 atto_recordrtc: changed HTML of attached recordings
This was done so the user can then click on the recording and
add subtitles etc - the same behaviour as 'atto_media'.
2018-04-13 12:59:24 +08:00
Mark Nelson
b5a3388bb1 MDL-60848 atto_recordrtc: language string changes
1. Ordered alphabetically by index.
2. Uncapitalised words after the first per Moodle standards.
3. Added string used by getUserMedia() on Chrome (possibly others).
2018-04-13 12:59:24 +08:00
Mark Nelson
1ecf5c15ca MDL-60848 atto_recordrtc: set valid default for 'allowedtypes' 2018-04-13 11:46:51 +08:00
Mark Nelson
6b21108b44 MDL-60848 editor_atto: upgrade to add recordrtc 2018-04-13 11:46:51 +08:00
Mark Nelson
dde2a79a70 MDL-60848 atto_recordrtc: bumped version 2018-04-13 11:46:51 +08:00
Mark Nelson
2ce4291183 MDL-60848 core: added recordrtc to core plugin list 2018-04-13 11:46:51 +08:00
Mark Nelson
8be5742cb1 MDL-60848 core: updated adapter.js and moved to core 2018-04-13 11:46:51 +08:00
David Monllao
20bf0c45ff weekly release 3.5dev 2018-04-12 14:38:12 +02:00
David Monllao
7cdeb8be2e NOBUG: Fixed SVG browser compatibility 2018-04-12 14:38:11 +02:00
David Monllao
6bef258db3 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-04-12 14:38:11 +02:00
David Monllao
547357df4b MDL-61298 pix: Removing ^M dos line ending characters 2018-04-12 13:34:33 +02:00
Kathrin Osswald
45ae297f7a MDL-61298 theme Boost: Nav drawer icon improvements - fixes. 2018-04-12 13:28:37 +02:00
Andrew Nicols
05dfaab2b4 Merge branch 'MDL-61852-master' of git://github.com/bmbrands/moodle 2018-04-12 13:14:03 +08:00
Bas Brands
fd70f25519 MDL-61852 core: downgrade popper to version 1.12.6 fixing usertours positioning issues 2018-04-12 07:02:14 +02:00
Andrew Nicols
934b1e9832 MDL-50907 antivirus: Switch to correct string 2018-04-12 10:30:25 +08:00
Ruslan Kabalin
30e1797f29 MDL-50907 antivirus_clamav: Add test coverage for scan_data. 2018-04-12 10:30:25 +08:00
Ruslan Kabalin
694cb8eb21 MDL-50907 antivirus: Add test coverage for scan_data. 2018-04-12 10:30:25 +08:00
Ruslan Kabalin
f6c5cfef77 MDL-50907 tool_messageinbound: Use antiviruses_scan_data for attachments scanning. 2018-04-12 10:30:25 +08:00
Ruslan Kabalin
ddf14b32fe MDL-50907 antivirus_clamav: Implement data scanning using unix sockets.
We use clamav data stream scanning functionality.
2018-04-12 10:30:25 +08:00
Ruslan Kabalin
bd74bda383 MDL-50907 antivirus: Implement data stream scanning default process. 2018-04-12 10:30:25 +08:00
Ruslan Kabalin
8504673116 MDL-50907 antivirus: Make antivirus_exception message more general.
Since the scan can be run not only as a result of file uploading, the
language string should be more general.
2018-04-12 10:30:25 +08:00
Eloy Lafuente (stronk7)
3451a05292 Merge branch 'MDL-61668-master' of git://github.com/jleyva/moodle 2018-04-12 00:31:18 +02:00
Eloy Lafuente (stronk7)
c9271388c9 Merge branch 'MDL-61802-master' of https://github.com/AlexWhitlatch/moodle 2018-04-12 00:22:40 +02:00
Eloy Lafuente (stronk7)
fc9f324fe2 Merge branch 'MDL-61828-master' of git://github.com/andrewnicols/moodle 2018-04-12 00:14:32 +02:00
Eloy Lafuente (stronk7)
a845d7d387 Merge branch 'MDL-61895-master' of git://github.com/andrewnicols/moodle 2018-04-11 23:57:46 +02:00
Eloy Lafuente (stronk7)
3b8c9ab2b8 Merge branch 'MDL-61896-master' of git://github.com/andrewnicols/moodle 2018-04-11 23:41:21 +02:00
Eloy Lafuente (stronk7)
74e48d168f Merge branch 'MDL-61859-master' of https://github.com/snake/moodle 2018-04-11 22:27:25 +02:00
Eloy Lafuente (stronk7)
0f0d0004bd Merge branch 'MDL-61208-master-fix' of git://github.com/farhan6318/moodle 2018-04-11 20:13:56 +02:00
Eloy Lafuente (stronk7)
d2706c5e58 Merge branch 'MDL-60940-master-forceclean' of git://github.com/mudrd8mz/moodle 2018-04-11 19:39:01 +02:00
Eloy Lafuente (stronk7)
2d42e6e12c Merge branch 'MDL-61743_master' of git://github.com/dmonllao/moodle 2018-04-11 19:23:01 +02:00
David Monllao
e171dc6dbe Merge branch 'MDL-61873-master' of git://github.com/cescobedo/moodle 2018-04-11 18:41:43 +02:00
David Monllao
a5db58f4f2 Merge branch 'MDL-61198-master' of git://github.com/jleyva/moodle 2018-04-11 18:23:59 +02:00
David Monllao
0ca25fe2a9 Merge branch 'MDL-61581-master' of https://github.com/lucaboesch/moodle 2018-04-11 18:07:09 +02:00
David Monllao
27fef51d48 MDL-55491 badges: Add missing format_string call
Extra version bump + trailing whitespace removal.
2018-04-11 17:55:45 +02:00
David Monllao
728b851eb5 Merge branch 'MDL-55491-master' of git://github.com/sarjona/moodle 2018-04-11 17:53:37 +02:00
Eloy Lafuente (stronk7)
8c46d204a1 MDL-60548 tests: Get tests passing
This includes:

- changing all usernames in feature to lowercase, for cross-db passing. Fixes:
  - user/tests/behat/set_email_display.feature
- ensure that course_enrolment_manager::get_potential_users() and
  external always returns user->maildisplay attribute, so email
  visibility can be calculated by user_get_user_details(). Fixes:
  - enrol/tests/behat/enrol_user.feature
  - blocks/news_items/tests/behat/display_news.feature
  - course/tests/behat/course_creation.feature
2018-04-11 17:15:38 +02:00
Farhan Karmali
351cff7928 MDL-61208 enrol: Fix for issue found while testing 2018-04-11 18:24:14 +05:30
David Mudrák
4b82c15cdb MDL-60940 weblib: Introduce an ability to force cleaning of all content
The new configuration flag $CFG->forceclean overrides the noclean
option when calling format_text() so that the text is always
and unconditionally cleaned.
2018-04-11 10:23:45 +02:00
Jake Dallimore
4af7042e6e Merge branch 'MDL-59691-master' of https://github.com/lucisgit/moodle 2018-04-11 16:01:03 +08:00
Andrew Nicols
2b118a941a Merge branch 'MDL-61208-master' of git://github.com/farhan6318/moodle 2018-04-11 10:52:29 +08:00
Andrew Nicols
8badf71325 Merge branch 'MDL-61881-master' of git://github.com/zig-moodle/moodle 2018-04-11 10:14:03 +08:00
Zig Tan
6f77c09777 MDL-61881 report: fix privacy lang strings 2018-04-11 10:06:51 +08:00
Jake Dallimore
da16e3e3dc Merge branch 'MDL-61255_master' of git://github.com/markn86/moodle 2018-04-11 09:53:14 +08:00
Andrew Nicols
46a13e37a8 Merge branch 'MDL-61731-master' of git://github.com/mihailges/moodle 2018-04-11 09:11:36 +08:00