Commit graph

86087 commits

Author SHA1 Message Date
Dan Poltawski
2999602b85 Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle 2017-09-07 10:58:38 +02:00
David Monllao
0a68e283d0 MDL-59657 analytics: Move lang string to correct location 2017-09-07 10:58:38 +02:00
Eloy Lafuente (stronk7)
95fc1e720c Merge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle 2017-09-07 10:58:35 +02:00
Andrew Nicols
030ede54f8 MDL-59759 enrol: Update behat tests for unenrol confirm dialogue 2017-09-07 10:53:35 +02:00
David Mudrák
911fcae895 MDL-59969 admin: Warn admins if a development libs directory exists
We can't really control the direct web access to directories in dirroot,
that is part of the server setup. So we at least warn admins as they may
not realize the risks of having directories like vendor or node_modules
exposed.

Credit goes to Petr Škoda for mentioning the PHPUnit issue CVE-2017-9841
to me.
2017-09-07 10:53:35 +02:00
Marina Glancy
a39d2976fe MDL-59972 mod_feedback: escape subject when showing the contact form 2017-09-07 10:53:34 +02:00
Jake Dallimore
4266786b48 MDL-58953 user: additional test case for user_can_view_profile() 2017-09-07 10:53:34 +02:00
Jake Dallimore
eb01e70b91 MDL-58953 user: fix course checking logic in user_can_view_profile()
Make sure to check that $user in enrolled in $course before checking
whether the current user has capabilities in that course, and make sure
that we don't check user context caps when handling a specific course.
2017-09-07 10:53:33 +02:00
Juan Leyva
35b9bca0ca MDL-58762 core: Get full course objects on navigation
The course object passed as parameter to extend_navigation_user
callback contained only a few parameters, some parameters like
showgrades or showreports were missing.
The callback should receive a full course object.
2017-09-07 10:53:33 +02:00
Juan Leyva
85b531e8be MDL-58762 report: Check group permissions in course user reports
Teachers were able to see any student report even with forced separated
groups and capability moodle/course:accessallgroups off.
2017-09-07 10:53:32 +02:00
Eloy Lafuente (stronk7)
423eca98d3 Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle 2017-09-07 10:53:32 +02:00
Simey Lameze
afa8c3daf1 MDL-59753 core_calendar: apply course filter without reload 2017-09-07 10:53:29 +02:00
Simey Lameze
ce679f6c98 MDL-59753 core_calendar: change course selector to normal select 2017-09-07 10:52:21 +02:00
David Monllao
0e0e92c5e0 Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle 2017-09-07 10:52:20 +02:00
Jun Pataleta
305f38d310 Merge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of https://github.com/scara/moodle 2017-09-07 10:52:19 +02:00
Eloy Lafuente (stronk7)
dd04df4164 MDL-59672 coding style: whitespace fixes 2017-09-07 10:52:18 +02:00
Eloy Lafuente (stronk7)
9d07b88ab4 Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle 2017-09-07 10:52:06 +02:00
Eloy Lafuente (stronk7)
59e56e7f71 Merge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle 2017-09-07 10:50:18 +02:00
Eloy Lafuente (stronk7)
d74bb0971e Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle 2017-09-07 10:50:18 +02:00
Dan Poltawski
83575729b6 Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:17 +02:00
David Monllao
4cc3f4f086 Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle 2017-09-07 10:50:17 +02:00
David Monllao
44e1928532 Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:16 +02:00
Dan Poltawski
72086f77f1 Merge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:15 +02:00
Dan Poltawski
edb911984a Merge branch 'MDL-59786_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:15 +02:00
David Monllao
e8466eee81 Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle 2017-09-07 10:50:14 +02:00
Dan Poltawski
f48b861302 Merge branch 'MDL-59840_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:13 +02:00
Dan Poltawski
c1346b1476 Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:13 +02:00
David Monllao
c4f7a1c001 Merge branch 'wip-MDL-59815-master' of git://github.com/abgreeve/moodle 2017-09-07 10:50:11 +02:00
David Monllao
d8e789c837 Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle 2017-09-07 10:49:36 +02:00
Dan Poltawski
0426cc9533 Merge branch 'MDL_59834-Indexing_of_personal_messages' of https://github.com/mattporritt/moodle 2017-09-07 10:49:35 +02:00
David Monllao
f827adbd91 Merge branch 'MDL-59864-master' of git://github.com/lameze/moodle 2017-09-07 10:49:34 +02:00
David Monllao
c0bcec46f7 Merge branch 'wip-MDL-59898-master-test' of git://github.com/abgreeve/moodle 2017-09-07 10:49:34 +02:00
Dan Poltawski
2d64ffeb6b Merge branch 'MDL-59657_master' of git://github.com/dmonllao/moodle 2017-09-07 10:49:30 +02:00
David Monllao
076d95ccc4 Merge branch 'MDL-59963-report-logs-origin-pagination' of https://github.com/lucaboesch/moodle 2017-09-07 10:46:57 +02:00
David Monllao
5700cf959e Merge branch 'MDL-59961_file_validation' of https://github.com/mrmark/moodle 2017-09-07 10:46:57 +02:00
Dan Poltawski
3c4675a002 Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle 2017-09-07 10:46:56 +02:00
Ryan Wyllie
ea5f7707e7 MDL-59919 calendar: add file support to event form 2017-09-07 01:38:43 +00:00
Damyon Wiese
b7df2485e6 MDL-59867 autocomplete: Prevent duplicate ids.
Rendering a form with 2 autocompletes in it can get messed up because of duplicated ids.
2017-09-07 09:31:57 +08:00
Marina Glancy
9971fac803 MDL-59808 webservice_rest: comply with restformat argument 2017-09-07 08:34:10 +08:00
Juan Leyva
bde5631d66 MDL-59244 mod_workshop: New WS mod_workshop_delete_submission 2017-09-06 15:51:55 +02:00
Juan Leyva
e1fcba9973 MDL-59244 mod_workshop: Move event triggering to API
Event triggering when a submission is deleted is now inside the
delete_submission function.
2017-09-06 15:51:54 +02:00
Juan Leyva
c1698a37e3 MDL-59245 mod_workshop: New WS mod_workshop_update_submission 2017-09-06 15:50:16 +02:00
Juan Leyva
c2cf2450ac MDL-59243 mod_workshop: New WS mod_workshop_add_submission 2017-09-06 14:00:17 +02:00
Juan Leyva
4c776cae2d MDL-59243 mod_workshop: Move submission creation to API 2017-09-06 13:57:11 +02:00
Juan Leyva
b1ed7279e0 MDL-60025 mod_book: Return correct values for chapters update time
Instead returning the time when the chapter was created or modified we
were returning the time when the book was created or modified.
2017-09-06 12:37:21 +02:00
Dan Poltawski
d9dff92fef MDL-59761 eslint: Auto-fix some minor lint warnings 2017-09-06 08:53:50 +01:00
Dan Poltawski
6f601313f0 MDL-59761 eslint: support glob-based configuration
Since ESlint 4.1.0 [1], it's possible to support glob-based
configuration, this means we can move glob configuration out of grunt
and into the config file, which means tools will respect the glob rules
now too. :)

[1] http://eslint.org/blog/2017/06/eslint-v4.1.0-released
2017-09-06 08:53:50 +01:00
Dan Poltawski
9702503f6b MDL-59761 eslint: Upgrade to v4.4.1
Including adding some new default rules.
2017-09-06 08:53:50 +01:00
Ryan Wyllie
7d659f2167 MDL-59399 atto: make media plugin shortform explandable 2017-09-06 05:24:21 +00:00
Andrew Nicols
5ded18d5a8 MDL-60031 admin: Move risk longtext to pix title 2017-09-06 10:23:48 +08:00