Daniel Thee Roperto
b8243e4164
MDL-58047 gradebook: fix sort by submission order.
2017-11-01 15:12:48 +11:00
David Monllao
40f1801c4b
on-demand release 3.4beta+
2017-10-27 12:49:10 +02:00
David Monllao
ff340a0afa
Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle
2017-10-26 19:17:28 +02:00
David Monllao
62a38a4ece
Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle
2017-10-26 19:15:44 +02:00
David Monllao
a272c25649
Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle
2017-10-26 18:33:49 +02:00
Mark Johnson
a9ca3fa167
MDL-60600 core_output: Clear static icon system cache between unit tests
2017-10-26 14:59:35 +01:00
David Monllao
7ec04e0e09
Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle
2017-10-26 10:27:34 +02:00
Jun Pataleta
1fc642324a
Merge branch 'MDL-59909-master' of git://github.com/damyon/moodle
2017-10-26 21:09:12 +13:00
Damyon Wiese
7f91fb036b
Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle
2017-10-26 16:02:13 +08:00
David Monllao
fd39db29e2
Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle
2017-10-26 09:47:22 +02:00
David Monllao
341505e5de
Merge branch 'MDL-60458-master' of git://github.com/damyon/moodle
2017-10-26 09:41:09 +02:00
Damyon Wiese
ef7df2ae0a
Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle
2017-10-26 14:43:39 +08:00
Damyon Wiese
ed6d81c9f7
MDL-59973 calendar: Remove duplication
...
The function calendar_get_default_courses is responsible for loading all variants of calendar
course lists.
1 the list of courses that the current user will see events for in the site calendar.
2 the list of courses the current user will see when they are looking at a specific course calendar.
3 the list of course calendars the current user can create / edit events in.
2017-10-26 14:39:35 +08:00
Damyon Wiese
01ed53df0f
MDL-59973 calendar: Only load required fields
...
When loading courses for the course filter on the calendar, we only need the id and shortname.
2017-10-26 14:21:29 +08:00
Andrew Nicols
4d03dbf13d
Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle
2017-10-26 14:19:43 +08:00
Andrew Nicols
4cc469b2cc
Merge branch 'MDL-60162' of git://github.com/timhunt/moodle
2017-10-26 14:04:45 +08:00
Damyon Wiese
1b7d75f19f
MDL-59973 calendar: Improve help for admin setting
2017-10-26 13:28:01 +08:00
Damyon Wiese
4dc645d64d
MDL-59973 calendar: Unittest calendar_get_default_courses
2017-10-26 13:28:01 +08:00
Damyon Wiese
a5327e449d
MDL-59973 calendar: Admin calendar course lists
...
Consolidate the logic for the list of courses an admin will see in the calendar.
They will see all courses if calendar_admincanseeall is enabled.
They will see only courses they are enrolled in of calendar_admincanseeall is not enabled.
They will also see the current course, if they are admin and it is not already in the list.
This applies to the course selector and the create and update event forms.
The calendar link in the navigation block has also been changed to link to the current course calendar instead of the global
one.
2017-10-26 13:28:00 +08:00
Andrew Nicols
4d4b8ae6bf
Merge branch 'MDL-60535-questionbank-button-styled' of https://github.com/lucaboesch/moodle
2017-10-26 13:17:56 +08:00
Jake Dallimore
1e67827131
Merge branch 'MDL-60434_master' of git://github.com/dmonllao/moodle
2017-10-26 13:11:46 +08:00
Damyon Wiese
7dfc9ea6b3
Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle
2017-10-26 12:52:11 +08:00
Marina Glancy
69e89f4a82
MDL-60390 tool_messageinboud: not strict index comparision
...
This is something that changed in the upgraded Horde library. structure->findBody() returns string but structure->contentTypeMap is indexed with ints
2017-10-26 12:44:51 +08:00
Andrew Nicols
b799cde890
Merge branch 'wip-MDL-60104-m34' of git://github.com/amygroshek/moodle
2017-10-26 11:32:54 +08:00
Andrew Nicols
9fd91f8eec
Merge branch 'master-MDL-51892' of https://github.com/fwsl/moodle
2017-10-26 11:08:50 +08:00
Jake Dallimore
6e186498fd
Merge branch 'MDL-59686-master' of git://github.com/lameze/moodle
2017-10-26 10:16:21 +08:00
Simey Lameze
3c2b703e00
MDL-59686 form: fix autosave support for editor field
2017-10-26 09:03:31 +08:00
Adrian Greeve
e6ccfad242
MDL-57055 mod_label: Add label administration for boost.
...
This patch adds the label adminstration settings to the
label edit page.
2017-10-26 08:41:33 +08:00
Jun Pataleta
75909e3c92
Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle
2017-10-26 11:22:30 +13:00
Jun Pataleta
2a1f7a4442
Merge branch 'MDL-60571-manualgrading-savegotonextpage-styled' of https://github.com/lucaboesch/moodle
2017-10-26 10:02:27 +13:00
David Monllao
7851132177
Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:16:21 +02:00
David Monllao
4f7a80341e
Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:14:54 +02:00
David Monllao
3b4e9a9fc8
Merge branch 'wip_MDL-60250_master' of git://github.com/gjb2048/moodle
2017-10-25 15:12:23 +02:00
David Monllao
507335e2de
Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle
2017-10-25 15:08:49 +02:00
David Monllao
5b93dc8539
Merge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:06:49 +02:00
David Monllao
3a89d0b541
MDL-60434 analytics: Analysables lazy loading
2017-10-25 14:16:35 +02:00
David Monllao
cc4d7ce61b
MDL-60434 analytics: Missing dependency
...
Sneaking it in...
2017-10-25 14:13:53 +02:00
David Monllao
b8bb8fe8de
MDL-60434 analytics: Remove legacy is_valid method
...
This method was used when the API was tied to students at risk model,
this method does not make sense any more as it is up to each target
to define what is a valid course.
2017-10-25 12:47:12 +02:00
David Monllao
d12e409784
Moodle release 3.4beta
2017-10-25 11:14:22 +02:00
David Monllao
b34460c669
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-10-25 11:14:20 +02:00
Damyon Wiese
a66de3ca70
MDL-59909 calendar: Try hard not to fail the adhoc task.
...
Triggering a fatal error in an adhoc task is bad. It will be retried indefinitely.
Even though we are not sure how to get a module instance without a course module record,
it is possible and should not kill the Moodle site.
2017-10-25 15:42:14 +08:00
Mihail Geshoski
6a633d36c2
MDL-60430 assignment: Assignment save and show next for 1 user
2017-10-25 14:18:16 +08:00
Andrew Nicols
2600f32927
Merge branch 'MDL-60506-master-fix1' of git://github.com/lameze/moodle
2017-10-25 12:45:56 +08:00
Andrew Nicols
8ef00034f5
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle
2017-10-25 12:45:55 +08:00
Jake Dallimore
19fa690c3f
MDL-60429 calendar: fix for updating event course and group
...
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
2017-10-25 12:45:54 +08:00
Jake Dallimore
e3a247849b
Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle
2017-10-25 12:45:53 +08:00
Jake Dallimore
c00e73dfe0
Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle
2017-10-25 12:45:52 +08:00
Jake Dallimore
bbb9e17133
Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle
2017-10-25 12:45:52 +08:00
Andrew Nicols
6ee00de11b
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle
2017-10-25 12:45:51 +08:00
Damyon Wiese
7b18365be7
MDL-60458 javascript: MathJax Workaround
...
Mathjax currently has a bug in an upstream library that is incorrectly
loading 'process' because it things it's running under Node.js.
We don't load modules by shortname - so it should be fine to map process to
something else.
Because of the syntax they used we need to map it to something that is already loaded
and evaluates to null (Their code will then assume the module could not be loaded and continue).
We have a handy module that is guaranteed to be loaded first and evaluates to null -> core/first.
We should remove this workaround when MathJax releases a fixed version on their CDN and update the docs.
2017-10-25 12:30:21 +08:00
