84275 Commits

Author SHA1 Message Date
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
David Monllao
932bc91cb4 on-demand release 3.3beta+ 2017-05-03 10:28:52 +08:00
David Monllao
03f4f26608 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-03 10:28:51 +08:00
Andrew Nicols
d98d245ba0 MDL-58746 core: Simplify environment check 2017-05-03 08:32:24 +08:00
AMOS bot
aac25da7fd Automatically generated installer lang files 2017-05-03 00:05:36 +08:00
Andrew Nicols
4270ebea38 Merge branch 'MDL-57704-master' of https://github.com/xow/moodle 2017-05-02 10:35:46 +08:00
John Okely
087662037b MDL-57704 ltiprovider: Don't force SSLv3 2017-05-02 09:33:18 +08:00
Andrew Nicols
db2c66e700 Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle 2017-05-02 09:00:07 +08:00
Marina Glancy
bb9d5f7f1b MDL-55468 mod_feedback: revive export analysis to excel 2017-05-01 14:28:55 +01:00
Dan Poltawski
f0572ad21f Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle 2017-05-01 11:25:39 +01:00
Marina Glancy
50d845e3ed MDL-58665 dashboard: use bigger course object for completion
class completion_info will make an extra DB query to retrieve the course if course->enablecompletion is not present
2017-05-01 16:59:07 +08:00
Marina Glancy
cd477f8c3e MDL-58665 mod_scorm: cache times in modinfo for performance 2017-05-01 16:59:04 +08:00
Andrew Nicols
2a87d81c5a Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle 2017-05-01 15:22:53 +08:00
Jake Dallimore
c7fe56a79b Merge branch 'MDL-58167-master' of git://github.com/lameze/moodle 2017-05-01 14:51:43 +08:00
Jun Pataleta
e85579693b Merge branch 'MDL-58632-master' of https://github.com/xow/moodle 2017-05-01 14:26:37 +08:00
David Monllao
e4838ca91b Merge branch 'MDL-58746-master' of git://github.com/andrewnicols/moodle 2017-05-01 13:41:07 +08:00
Marina Glancy
e1577187ed MDL-58665 mod_data: cache times in modinfo for performance 2017-05-01 12:57:22 +08:00
Marina Glancy
19228840b8 MDL-58665 mod_choice: cache choice time in modinfo for performance 2017-05-01 12:57:22 +08:00
Marina Glancy
aa708b550e MDL-58665 mod_feedback: avoid extra db queries on dashboard 2017-05-01 12:57:19 +08:00
Jake Dallimore
434f31bc12 Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle 2017-05-01 12:14:42 +08:00
Jun Pataleta
8011a2bf47 Merge branch 'MDL-58720-master' of git://github.com/jleyva/moodle 2017-05-01 10:47:52 +08:00
Ryan Wyllie
74e5816a7e MDL-58732 block_myoverview: fix course view event groupings 2017-05-01 02:18:57 +00:00
Ryan Wyllie
2104e7a5e3 MDL-58732 block_myoverview: improve style of empty course palceholder 2017-05-01 02:17:47 +00:00
Ryan Wyllie
7243eef945 MDL-58732 block_myoverview: add max-width to block content 2017-05-01 02:15:41 +00:00
Simey Lameze
efa0c254e7 MDL-58167 theme: update accessibility templates on clean 2017-05-01 09:42:10 +08:00
Simey Lameze
cff78dc47b MDL-58167 block_myoverview: improve block accessibility 2017-05-01 09:42:10 +08:00
Andrew Nicols
9a2854cc65 MDL-58746 core: Add environment check for finfo 2017-05-01 09:01:21 +08:00
David Mudrák
a84d351e3d MDL-58760 templates: Fix the template context documentation
This change was missed in the commit 663640f5 and I spotted it while
working on this issue.
2017-04-28 23:08:13 +02:00
David Mudrák
74e238f4b7 MDL-58760 templates: Make {{#pix}} helper work with escaped icon key
There is a difference between how our PHP mustache engine and JS
mustache engine escaping works. If the icon key is not hard-coded in the
template but defined as a context variable, the JS mustache engine
escapes the forward slashes.
2017-04-28 23:04:04 +02:00
Dan Poltawski
06e3b6d8ba on-demand release 3.3beta+ 2017-04-28 12:36:29 +01:00
Dan Poltawski
0fa1c5a100 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-04-28 12:36:27 +01:00
Dan Poltawski
712a9b6481 Merge branch 'MDL-58643-master' of git://github.com/snake/moodle 2017-04-28 09:44:35 +01:00
Jake Dallimore
7b86f2208f MDL-58643 behat: ensure results are in first page + multi suite fix. 2017-04-28 12:47:55 +08:00
Jun Pataleta
dcb8e677f9 Merge branch 'MDL-58741-master' of git://github.com/jleyva/moodle 2017-04-28 11:59:47 +08:00
Andrew Nicols
847d88bb4c MDL-58573 mod_assign: Whitespace fix 2017-04-28 11:58:14 +08:00
Andrew Nicols
8374422402 Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle 2017-04-28 11:46:02 +08:00
Andrew Nicols
e6c0e75ed8 Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle 2017-04-28 10:29:50 +08:00
Jun Pataleta
a43e85d5e4 MDL-58573 mod_assign: Upgrade code for default gradingduedate
* Set default grading due date one week from the due date if:
  - there is no grading due date set; and
  - the assignment's due date is not older than 3 weeks from the
    current date.
2017-04-28 10:28:35 +08:00
Marina Glancy
438c01d0dd MDL-58731 modules: display intro on the course page
something that was forgotten when adding _get_coursemodule_info to activities in MDL-58190
2017-04-28 09:14:25 +08:00
Dan Poltawski
baf3d04954 Merge branch 'wip-MDL-58689-master' of git://github.com/marinaglancy/moodle 2017-04-27 18:35:28 +01:00
Dan Poltawski
e6dd8f32f5 Merge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github.com/marcusgreen/moodle 2017-04-27 17:02:12 +01:00
Juan Leyva
a4727b81f6 MDL-58741 webservice: Add missing params to webservice/pluginfile.php
MDL-58334 and MDL-32471 introduced new parameters in pluginfile.php but
they are missing from webservice/pluginfile.php

We need the offline one in the Mobile app (this new parameter was
designed thinking in the mobile app)
2017-04-27 17:04:01 +02:00
Dan Poltawski
3ee1817ea0 Merge branch 'MDL-58722-master' of git://github.com/damyon/moodle 2017-04-27 14:36:23 +01:00
Cameron Ball
d0dc97bf3a
MDL-58575 core_calendar: Group override tests for same priority
This patch adds tests for when group override events have the same
priority.
2017-04-27 19:12:50 +08:00
Damyon Wiese
51742ffdc4 MDL-58722 mathjax: Update to 2.7.1 and remove a11y
2.7.1 bundles the accessibility and mchem extensions so we no longer need to bundle them and apply custom config.
2017-04-27 16:57:03 +08:00
Juan Leyva
935429e2a5 MDL-58720 course: Return restricted sections and modules in get_contents
core_course_get_contents was only checking for modules visible by the
user (via uservisible).
It was not checking for modules that are not visible for the user but
should be displayed in the course because they have access restrictions
configured.
2017-04-27 10:53:17 +02:00
Eloy Lafuente (stronk7)
7a21720039 Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle 2017-04-27 09:55:45 +02:00
Cameron Ball
4bd022ed0c
MDL-58575 core_calendar: Properly restrict groups in event vault
Previously we were not filtering on groups in the event vault
which meant events for all groups would be returned regardless
of which user was passed in.

This resulted in situations where one student would group overrides
for groups they were not in.
2017-04-27 15:23:53 +08:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00
Cameron Ball
30aa540fe7
MDL-58578 mod_assign: Correctly update user override priority
Since we now sort priority in ASC order, the top priority should be 0.
2017-04-27 15:15:12 +08:00