David Monllao
43eadce6fc
Merge branch 'm35_MDL-58015' of https://github.com/danmarsden/moodle into MOODLE_35_STABLE
2018-07-31 13:37:11 +02:00
David Monllao
98fe6eee32
Merge branch 'MDL-59611-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE
2018-07-31 13:31:07 +02:00
David Monllao
671ad6b497
Merge branch 'MDL-44538-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE
2018-07-31 11:21:16 +02:00
Jun Pataleta
49bfb1e5f9
Merge branch 'MDL-58768-35-2' of git://github.com/rezaies/moodle into MOODLE_35_STABLE
2018-07-31 16:18:26 +08:00
Shamim Rezaie
936ed6067f
MDL-58768 mod_assign: Fixed incorrect version number in upgrade.php
2018-07-31 16:23:56 +10:00
Shamim Rezaie
238006f649
MDL-58768 mod_assign: Added userid param to calendar callbacks
...
The mod_assign_core_calendar_is_event_visible and mod_assign_core_calendar_provide_event_action
functions now accept a new parameter ($userid) so they are not always dependet to the logged in user.
2018-07-31 16:15:38 +10:00
Shamim Rezaie
d11038dd43
MDL-58768 core: Fix a typo for callback name
2018-07-31 16:15:38 +10:00
Shamim Rezaie
6b8b06911b
MDL-58768 mod_assign: Add $user param to assign::can_grade
2018-07-31 16:15:38 +10:00
Shamim Rezaie
fe1ae23939
MDL-58768 calendar: Add $requestinguser to the container class
...
The requesting user is not always the same as the current user. The container class now allows a different user
to be set as the requesting user. All capability checks are done against the requesting user.
Also, the $requestinguser is passed to core_calendar_provide_event_action and core_calendar_is_event_visible
callback functions. These callback functions need to be updated in all activity modules to accept a $user parameter.
2018-07-31 16:15:38 +10:00
Shamim Rezaie
64b5d44abc
MDL-58768 coursecat: coursecat::get to accept a $user parameter
2018-07-31 16:15:37 +10:00
Shamim Rezaie
526e3e8c97
MDL-58768 Calendar: Update get_raw_events_legacy_implementation
...
Update get_raw_events_legacy_implementation to work with the passed $users parameter instead of the logged in user.
Also, fixed a bug where get_raw_events_legacy_implementation was failing when $users was set to true, and a list of
$groups was given.
2018-07-31 16:15:37 +10:00
Shamim Rezaie
8668391630
MDL-58768 Calendar: Added user param to calendar_set_filters
...
Decoupled calendar_set_filters from $USER.
Also removed the backward compatibility bit from the function because it was a left over.
2018-07-31 16:15:06 +10:00
Shamim Rezaie
f35e7a0eeb
MDL-58768 Calendar: Added userid param to calendar_get_default_courses
2018-07-31 16:07:15 +10:00
Eloy Lafuente (stronk7)
949f522c13
Merge branch 'MDL-57977-35' of git://github.com/vmdef/moodle into MOODLE_35_STABLE
2018-07-30 21:10:08 +02:00
Eloy Lafuente (stronk7)
ac6bef4e38
Merge branch 'MDL-63002_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE
2018-07-30 16:15:27 +02:00
Mark Nelson
1b4cd6be30
MDL-63002 core: fixed incorrect calls to non-existent delete_record()
2018-07-30 21:00:25 +08:00
Adrian Perez
10dae695ec
MDL-63002 core_grade: fixed deletion of overriden letters
2018-07-30 21:00:24 +08:00
Jun Pataleta
fc12d8d459
Merge branch 'MDL-62931-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE
2018-07-30 16:34:36 +08:00
Jun Pataleta
8aa12f5bff
Merge branch 'MDL-62950-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE
2018-07-27 16:19:02 +08:00
Andrew Nicols
5a1aa729df
MDL-62950 behat: Disable editing for boost test
2018-07-27 10:59:46 +08:00
Andrew Nicols
6020745280
MDL-62950 behat: Correct navbar references
2018-07-27 10:59:46 +08:00
Andrew Nicols
948485dbd6
MDL-62950 behat: Correct use of nav
2018-07-27 10:59:45 +08:00
Andrew Nicols
1da88f2c6a
MDL-62950 behat: Correct path to P&P
2018-07-27 10:59:45 +08:00
Dan Marsden
c1a29fc252
MDL-58015 mod_scorm: set orgidentifier correctly for popup.
2018-07-27 10:36:43 +12:00
Eloy Lafuente (stronk7)
a1d8976005
weekly release 3.5.1+
2018-07-26 19:56:50 +02:00
Vadim Tabunshchik
c0171e6090
MDL-62871 quiz: incorrect foreign key declaration
2018-07-26 11:38:51 +02:00
Eloy Lafuente (stronk7)
bdf7f7613e
Merge branch 'MDL-62771-35_move_plag_disclosure' of https://github.com/jmcgettrick/moodle into MOODLE_35_STABLE
2018-07-26 00:39:10 +02:00
Jun Pataleta
b42457028a
Merge branch 'MDL-62852-35' of git://github.com/sarjona/moodle into MOODLE_35_STABLE
2018-07-25 16:38:11 +08:00
Sara Arjona
783f2a8b8e
MDL-62852 policy: Display policy audience in the viewall.php page
2018-07-25 10:20:37 +02:00
Jun Pataleta
ac496f22af
Merge branch 'MDL-62807-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE
2018-07-25 13:44:36 +08:00
Andrew Nicols
a1c3aedf5b
Merge branch 'MDL-60826-35-fix' of https://github.com/lameze/moodle into MOODLE_35_STABLE
2018-07-25 13:42:58 +08:00
Simey Lameze
a2c9e82c42
MDL-60826 calendar: fix group event type logic
2018-07-25 12:54:50 +08:00
Andrew Nicols
82d2d27cd3
Merge branch 'MDL-62897-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE
2018-07-25 12:42:58 +08:00
Tony Butler
e8d8bccb25
MDL-59611 mod_assign: Move help icons for subplugin types out of labels
2018-07-25 12:22:50 +08:00
Shamim Rezaie
daff43e9c7
MDL-62897 Questions: Find duplicate top cats per context and fix them
2018-07-25 12:29:04 +10:00
Andrew Nicols
6aedf45bee
Merge branch 'MDL-60826-35' of git://github.com/lameze/moodle into MOODLE_35_STABLE
2018-07-25 09:19:43 +08:00
Simey Lameze
fa9fffdc9a
MDL-60826 calendar: further performance improvements
...
This commit does few tweaks and other performance improvements to
calendar_get_allowed_event_types to be more efficient. Also some minor
queries optimizations on the event form to fetch the list of courses
without groups.
2018-07-25 08:59:04 +08:00
Simey Lameze
7ad1d28554
MDL-60826 calendar: restrict course fields to be retrieved
2018-07-25 08:59:04 +08:00
Simey Lameze
3f3385c46a
MDL-60826 calendar: update manage subscription page to use new function
2018-07-25 08:59:04 +08:00
Simey Lameze
11ebc149ed
MDL-60826 calendar: lazy load groups on event form
2018-07-25 08:59:04 +08:00
Simey Lameze
c985ad6263
MDL-60826 calendar: tests for calendar_get_allowed_event_types
2018-07-25 08:59:04 +08:00
Simey Lameze
6a6d683283
MDL-60826 calendar: introduce calendar_get_allowed_event_types function
2018-07-25 08:59:04 +08:00
Andrew Nicols
ab9f7ab790
Merge branch 'MDL-61652-35' of git://github.com/mihailges/moodle into MOODLE_35_STABLE
2018-07-25 08:34:39 +08:00
Eloy Lafuente (stronk7)
3248a578e9
Merge branch 'MDL-62961_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE
2018-07-25 01:24:52 +02:00
Eloy Lafuente (stronk7)
3cd9d0a689
Merge branch 'MDL-62935-35' of git://github.com/bmbrands/moodle into MOODLE_35_STABLE
2018-07-25 01:17:22 +02:00
Andrew Nicols
8ee6b2a201
MDL-62653 behat: Ensure that tasks run properly from behat
2018-07-25 00:39:04 +02:00
Eloy Lafuente (stronk7)
692049a9c1
Merge branch 'MDL-60874-35-enrolautocomplete' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE
2018-07-24 19:06:07 +02:00
Eloy Lafuente (stronk7)
36895ee702
Merge branch 'MDL-62925_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE
2018-07-24 18:32:49 +02:00
Jun Pataleta
68e2d67939
Merge branch 'MDL-62919-35' of git://github.com/cescobedo/moodle into MOODLE_35_STABLE
2018-07-24 16:24:04 +08:00
Bas Brands
dd6f34e334
MDL-62935 boost: slideshow view page overflow
2018-07-24 10:23:20 +02:00