86634 Commits

Author SHA1 Message Date
Simey Lameze
7522ed1f23 MDL-59921 core_calendar: fix phpunit failures on event form 2017-10-10 15:50:46 +08:00
Jun Pataleta
37dcdf2202 Merge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle 2017-10-10 15:26:38 +08:00
Simey Lameze
de6d57cfd8 MDL-59921 core_calendar: fix event form behat failures 2017-10-10 15:22:45 +08:00
Andrew Nicols
c8ee0b642d Merge branch 'MDL-35429-master' of https://github.com/snake/moodle 2017-10-10 14:48:19 +08:00
Simey Lameze
4259387ebb MDL-60092 core_calendar: remove unused calendar_get_upcoming method 2017-10-10 13:55:35 +08:00
Simey Lameze
522b84be04 MDL-60092 block_calendar_upcoming: convert to template 2017-10-10 13:55:35 +08:00
Simey Lameze
666d03e119 MDL-60092 core_calendar: new upcoming mini template 2017-10-10 13:55:29 +08:00
Jun Pataleta
e34196d6ef Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle 2017-10-10 13:30:34 +08:00
Mark Nelson
a475e0fe79 MDL-45730 core: added unit tests for new events 2017-10-10 13:15:18 +08:00
Mark Nelson
7b1adb4c7e MDL-45730 core_user: added additional event triggers 2017-10-10 13:05:48 +08:00
Damyon Wiese
93effd739f Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle 2017-10-10 13:05:31 +08:00
Damyon Wiese
71fd9e5375 Merge branch 'wip-MDL-59274-master' of git://github.com/marinaglancy/moodle 2017-10-10 12:46:55 +08:00
Jake Dallimore
5bbea7338d MDL-35429 backup: Only show relevant actions for automated backups
- Users without permission to download or restore won't see the
respective links.
- The 'Manage backup files' button for the 'automated' backup filearea
now requires the same permissions as downloading does for this filearea,
those being 'restore:userinfo' and 'backup:downloadfile'.
2017-10-10 12:30:57 +08:00
Marina Glancy
ce1500a8fa MDL-59274 media_videojs: upgrade video.js library and plugins 2017-10-10 12:11:06 +08:00
Ryan Wyllie
4c1145009a MDL-60058 assign: show due date calendar event for teachers 2017-10-10 03:51:18 +00:00
Andrew Nicols
69ed35c92a Merge branch 'MDL-59694_master' of git://github.com/dmonllao/moodle 2017-10-10 11:37:49 +08:00
Jun Pataleta
d63c2d35ec Merge branch 'MDL-60205_group_hiding_clean' of git://github.com/davosmith/moodle 2017-10-10 11:08:06 +08:00
Damyon Wiese
1bf6dcc507 MDL-60046 participants: Update behat tests
The filter button was removed, so it needs to be removed from the tests.
2017-10-10 10:54:27 +08:00
Jun Pataleta
658982416c Merge branch 'MDL-60238-master' of git://github.com/ankitagarwal/moodle 2017-10-10 10:47:37 +08:00
Marina Glancy
b47fda7191 MDL-60029 core_user: new api functions rearranged 2017-10-10 10:34:55 +08:00
Jun Pataleta
7106ac6b15 Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle 2017-10-10 10:10:09 +08:00
Andrew Nicols
1e7ed737d2 Merge branch 'MDL-45366' of git://github.com/stronk7/moodle 2017-10-10 08:40:01 +08:00
Adam Olley
d12ac53512 MDL-60320 icons: Use PNG icons as the preview thumbnails
Without this change, Moodle fails to provide any data when requesting a
thumbnail for a non-image file as its looking to provide a SVG file that
doesn't exist.
2017-10-10 09:57:17 +10:30
Eloy Lafuente (stronk7)
3564271049 Merge branch 'MDL-60070-master' of git://github.com/lameze/moodle 2017-10-10 00:03:10 +02:00
Eloy Lafuente (stronk7)
6d170ad508 Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle 2017-10-09 23:17:36 +02:00
Eloy Lafuente (stronk7)
4c54ac22d3 Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https://github.com/scara/moodle 2017-10-09 23:11:08 +02:00
Eloy Lafuente (stronk7)
eda8027541 Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle 2017-10-09 19:52:56 +02:00
AMOS bot
59ce7064b2 Automatically generated installer lang files 2017-10-10 00:11:43 +08:00
Guillaume Latour
febd7a62f7 MDL-60171 user/edit: more meaning for delete pic
AMOS BEGIN
    CPY [delete,core_moodle],[deletepicture,core_moodle]
AMOS END
2017-10-09 15:10:06 +02:00
Alexander Bias
33a3ec7c93 MDL-58388 course: Add admin control for course end date default 2017-10-09 14:12:52 +02:00
John Ehringer
6d242b28e6 MDL-45730 core: Adding events to user profile field and categories CRUD. 2017-10-09 18:58:36 +08:00
David Mudrák
b75eb8442f MDL-60209 mathjax: Update integration docs in readme_moodle.txt 2017-10-09 12:31:21 +02:00
David Mudrák
47cf9455d9 MDL-60209 mathjax: Fix mapping of the Moodle language to the MathJax
While working on the issue, I noticed that the current implementation of
the method filter_mathjaxloader::map_language_code() is suboptimal and
does not work well for many Moodle language packs such as pt_br or de_du
and other variants. It did not give particularly wrong results. It just
fell back to the default English too early without trying more hard.

This patch improves the mapping logic and adds a unit test for the
method.
2017-10-09 12:31:21 +02:00
David Mudrák
b7ab8e4e9b MDL-60209 mathjax: Use MathJax 2.7.2 by default 2017-10-09 12:31:20 +02:00
Jun Pataleta
a5ed356be1 Merge branch 'MDL-60298' of git://github.com/stronk7/moodle 2017-10-09 16:18:36 +08:00
Mike Churchward
860f59b13c MDL-60029 core_user: Added new api function to reduce db calls. 2017-10-09 14:10:38 +08:00
Andrew Nicols
7da1dd651a Merge branch 'MDL-60317' of git://github.com/timhunt/moodle 2017-10-09 14:05:57 +08:00
Andrew Nicols
f3500bda4e Merge branch 'MDL-59844-master' of git://github.com/Dagefoerde/moodle 2017-10-09 13:58:49 +08:00
David Monllao
dd13fc222c MDL-59694 analytics: Track processed analysables 2017-10-09 07:47:28 +02:00
David Monllao
68f4be7085 MDL-59987 analytics: Updated indicator names
Indicator names updated to better reflect what they make
reference to.
2017-10-09 07:38:55 +02:00
Andrew Nicols
2e30e9aa0d Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle 2017-10-09 12:42:53 +08:00
Mark Nelson
f473958e49 MDL-59106 theme_bootstrapbase: removed unnecessary template overrides 2017-10-09 12:20:42 +08:00
Mark Nelson
c614073940 MDL-59106 report_insights: show time created and time range used 2017-10-09 12:20:42 +08:00
Andrew Nicols
5873e1d234 MDL-60374 calendar: Add transition on event show/hide in monthly view 2017-10-09 12:04:04 +08:00
Andrew Nicols
bf02f2e91c MDL-60373 core: Do not show title if there is no title 2017-10-09 11:38:00 +08:00
Andrew Nicols
5be48c4514 MDL-59897 accesslib: Remove unused reset 2017-10-09 10:37:19 +08:00
Andrew Nicols
6ba5f93ea6 Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle 2017-10-09 10:31:34 +08:00
Jake Dallimore
54945fa728 MDL-35429 roles: teachers and managers can restore automated backups
Changes the default for the 'moodle/restore:viewautomatedfilearea'
cap from 'Not set' to 'Allow' for the teacher and manager role
archetypes.
2017-10-09 10:29:07 +08:00
Jake Dallimore
521d900f06 MDL-35429 restore: fixed downloading of automated backup files 2017-10-09 10:29:07 +08:00
Jake Dallimore
f2faf9fae6 MDL-35429 restore: capability clarification for automated backups
- added relevant cap check on restorefile.php to improve the error
message when attempting to restore automated backups. This cap is
already responsible for controlling restores from automated areas.
- Restored the 'viewautomatedfilearea' capabilities original lang
string.
2017-10-09 10:29:07 +08:00