mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
86,023 Commits 36 Branches 519 Tags
Commit Graph

86023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Pataleta
d887e98b56 Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle 2017-09-12 16:29:43 +08:00
Eloy Lafuente (stronk7)
bf30e4dc86 Merge branch 'MDL-60086-master' of https://github.com/snake/moodle 2017-09-12 09:56:23 +02:00
Jun Pataleta
63b384d02a Merge branch 'MDL-59919-master' of git://github.com/ryanwyllie/moodle 2017-09-12 14:58:06 +08:00
David Monllao
dc9f39bfc3 Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle 2017-09-12 08:12:26 +02:00
David Monllao
651f1a1703 Merge branch 'MDL-59831_master' of git://github.com/markn86/moodle 2017-09-12 08:07:52 +02:00
David Monllao
2cef0d3ade Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle 2017-09-12 07:10:46 +02:00
David Monllao
fb6ff3c553 Merge branch 'MDL-59879-master' of https://github.com/abias/moodle 2017-09-12 07:04:34 +02:00
Jake Dallimore
9f813ab5df MDL-60086 travis: Bumping the postgres version to 9.6 
3.2 was bumped to 9.6, this makes the change across the board.
 2017-09-12 09:33:52 +08:00
Jun Pataleta
311a0b283b Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle 2017-09-12 08:55:47 +08:00
Andrew Nicols
a7bf76cee8 MDL-59392 calendar: Remove bad behat tag 2017-09-12 08:34:40 +08:00
Eloy Lafuente (stronk7)
e658430a88 Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle 2017-09-12 01:43:19 +02:00
Eloy Lafuente (stronk7)
2e6112dd3f Merge branch 'MDL-59926-master' of https://github.com/sammarshallou/moodle 2017-09-12 00:27:49 +02:00
Eloy Lafuente (stronk7)
69cfd26e15 Merge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle 2017-09-12 00:21:48 +02:00
Eloy Lafuente (stronk7)
0071665686 Merge branch 'wip-MDL-59808-master' of git://github.com/marinaglancy/moodle 2017-09-12 00:13:28 +02:00
Eloy Lafuente (stronk7)
f20f9448f7 Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle 2017-09-11 23:50:36 +02:00
Eloy Lafuente (stronk7)
6e49ef0d94 Merge branch 'MDL-59934-master' of git://github.com/ryanwyllie/moodle 2017-09-11 23:19:48 +02:00
Dan Poltawski
4d4c5992ee Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle 2017-09-11 14:39:43 +01:00
Dan Poltawski
52516f2b19 Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle 2017-09-11 14:18:51 +01:00
Dan Poltawski
743c937dae Merge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattporritt/moodle 2017-09-11 14:01:40 +01:00
Jun Pataleta
eca853c8eb Merge branch 'MDL-59977_master' of git://github.com/markn86/moodle 2017-09-11 17:18:16 +08:00
Jun Pataleta
02e10f8592 Merge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle 2017-09-11 13:56:56 +08:00
Jun Pataleta
dd6e17c3b6 Merge branch 'wip-MDL-55849-master' of git://github.com/abgreeve/moodle 2017-09-11 13:26:50 +08:00
Mark Nelson
32e5109d7f MDL-59831 core_user: only set default group when necessary 2017-09-11 12:47:25 +08:00
Mark Nelson
580a5588f1 MDL-59831 core_user: show all groups in select when in visible groups 2017-09-11 12:47:25 +08:00
Andrew Nicols
7aaca085fb MDL-59392 calendar: Deprecate old event filters 2017-09-11 12:45:47 +08:00
Andrew Nicols
fc60d3194f MDL-59392 calendar: Apply event filters to main calendar view 2017-09-11 12:45:47 +08:00
Andrew Nicols
c8b6e9ab34 MDL-59392 calendar: Switch to templates in the cal block 
This commit adds a set of templates for the calendar month block, and
the events filter. The same data exporters used in the main calendar
view are utilised and the same logic.

Some additional data was added to the exporters, and in the long term
this will be used in the main monthly view so I did not feel it was
prudent to strip it out into a different view of the model.

AMOS BEGIN
 MOV [monthnext,access],[monthnext,calendar]
AMOS END
 2017-09-11 12:45:46 +08:00
Mark Nelson
93b47710ac MDL-59977 core: do not directly check 'viewparticipant' capability 2017-09-11 12:44:27 +08:00
Jun Pataleta
fb1af0797c Merge branch 'MDL-35668-master-fix' of git://github.com/junpataleta/moodle 2017-09-11 11:34:00 +08:00
Jun Pataleta
68b998906e MDL-35668 phpunit: Add filebrowser test folder to phpunit.xml 2017-09-11 11:24:51 +08:00
Jun Pataleta
4dfc2d19e7 Merge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle 2017-09-11 11:01:41 +08:00
Andrew Nicols
41fa6a24be MDL-59392 calendar: Stop polluting history with useless URLs 2017-09-11 10:00:50 +08:00
Andrew Nicols
6ff225f57e MDL-59392 calendar: Correct the next period (add vs sub) 2017-09-11 10:00:50 +08:00
Andrew Nicols
39e40fda71 MDL-59392 calendar: Add the calendar info to the exporter 2017-09-11 10:00:49 +08:00
Andrew Nicols
fb9be27127 MDL-59392 calendar: Split day exporter to week exporter 2017-09-11 10:00:45 +08:00
Andrew Nicols
2281a835c9 MDL-59392 calendar: Move template to parent Node 2017-09-11 09:14:36 +08:00
Andrew Nicols
6397ec5452 MDL-59392 calendar: ViewManager should take a root 2017-09-11 09:13:47 +08:00
Ryan Wyllie
02e091b1f3 MDL-59934 calendar: remove more button from event form modal 2017-09-08 02:45:54 +00:00
David Monllao
32f9550e85 weekly release 3.4dev 2017-09-07 11:39:02 +02:00
David Monllao
ce99f1fa5a MDL-59657 analytics: No predictions until training is completed 2017-09-07 10:58:39 +02:00
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