Commit graph

94804 commits

Author SHA1 Message Date
Jun Pataleta
4d56b58787 Merge branch 'MDL-65129-master-2' of git://github.com/peterRd/moodle 2019-08-14 15:31:07 +08:00
Jun Pataleta
7da3ab8359 Merge branch 'MDL-65925-grade-page-broken-for-deleted-submission-master' of https://github.com/ilya-catalyst/moodle 2019-08-14 15:28:14 +08:00
Peter
87c71d18de MDL-65129 mod_forum: Behat test for favourited search 2019-08-14 14:59:35 +08:00
Peter
dd223096b8 MDL-65129 mod_forum: Ability to search based on favourite status 2019-08-14 14:59:30 +08:00
Adrian Greeve
523e51ff4d Merge branch 'MDL-65621-dimmed-courses' of https://github.com/stopfstedt/moodle 2019-08-14 14:56:07 +08:00
David Monllaó
2bbe76bf06 MDL-66210 analytics: Unit test for reuseprevanalysed 2019-08-14 14:31:54 +08:00
David Monllaó
ca61e4d4f0 MDL-66210 analytics: Update references to ->options 2019-08-14 14:31:54 +08:00
David Monllaó
d1af71c35d MDL-65993 analytics: Fix --filter option for by_course models 2019-08-14 14:30:20 +08:00
David Monllaó
6981d823a2 MDL-66241 analytics: Verify that activities_due works on at-risk 2019-08-14 14:29:16 +08:00
David Monllaó
d7ef852c83 MDL-66241 analytics: activities_due compatible with at-risk models 2019-08-14 14:29:16 +08:00
Andrew Nicols
9311a83b45 Merge branch 'patch-1' of https://github.com/aspark21/moodle 2019-08-14 11:33:57 +08:00
Ryan Wyllie
c872ec0cbd MDL-66148 mod_assign: update override page for relative dates mode 2019-08-14 10:40:55 +08:00
Andrew Nicols
59008247db Merge branch 'MDL-60916-master_replace_course_search_wth_global_search' of https://github.com/gmrsagar/moodle 2019-08-14 10:35:22 +08:00
Andrew Nicols
d120bbcef6 Merge branch 'MDL-65950-master' of git://github.com/junpataleta/moodle 2019-08-14 10:17:00 +08:00
Adrian Greeve
0a28a2f074 Merge branch 'MDL-52849-master' of git://github.com/peterRd/moodle 2019-08-14 09:03:37 +08:00
Jun Pataleta
1648b5ac6e Merge branch 'MDL-66147-master' of https://github.com/snake/moodle 2019-08-13 16:34:34 +08:00
Jun Pataleta
1cac0870b8 MDL-65950 core_user: Add hidden labels for the user checkboxes
* And update Behat tests accordingly and nuke the steps that are using
xpath.
2019-08-13 16:02:02 +08:00
Jun Pataleta
df92be9d67 MDL-65950 core_user: Use new core/checkbox-toggleall 2019-08-13 15:21:34 +08:00
Jake Dallimore
9ce55a8668 MDL-66147 mod_assign: behat test covering relative due date field
Tests that each student has a fixed amount of time, relative to their
course start date, in which to submit the assignment, and that teachers
are shown the dates relative to each student when grading.
2019-08-13 15:09:13 +08:00
Jake Dallimore
d0cff2367a MDL-66147 mod_assign: external get_participant supports relative dates 2019-08-13 15:09:13 +08:00
Jake Dallimore
c0bb682756 MDL-66147 mod_assign: grading table duedate column updates
Couple of changes:
- The duedate, cutoffdate and allowsubmissionsfromdate are now always
shown for relative dates courses.
- When relative dates mode is enabled, calculate and apply the enrolment
start offset to the due date in SQL. No changes to col_duedate needed.
Sorting is supported.
2019-08-13 15:09:13 +08:00
Jake Dallimore
9bf91ea832 MDL-66147 mod_assign: grading table status col shows relative dates
The 'Status' column is sorted using 'status ASC/DESC, userid ASC',
where status does not contain the due date. Overdue assignments
have additional information displayed, but this is unrelated to
the sort, meaning we don't need to change anything with sorting.
2019-08-13 15:09:13 +08:00
Jake Dallimore
9e719b81d4 MDL-66147 mod_assign: submissions overview page shows time interval
Use get_time_interval_string() on the teacher only page, to show how
long after the course start the assignment is due for each user.
2019-08-13 15:09:11 +08:00
Andrew Nicols
9abc0ed875 Merge branch 'MDL-65949-master' of git://github.com/junpataleta/moodle 2019-08-13 14:39:48 +08:00
Adrian Greeve
2217ca91ee Merge branch 'MDL-57623' of git://github.com/Chocolate-lightning/moodle 2019-08-13 14:27:30 +08:00
Mathew May
09dedee2e1 MDL-57623 behat: Remove deprecated step from 3.3 2019-08-13 14:24:34 +08:00
Jun Pataleta
29c5579db9 Merge branch 'MDL-62034-master' of git://github.com/andrewnicols/moodle 2019-08-13 14:20:42 +08:00
Andrew Nicols
24d2a49e21 MDL-62034 assign: Add hint for user tour reset 2019-08-13 14:12:29 +08:00
Andrew Nicols
c188ddfe93 Merge branch 'MDL-59524-master' of git://github.com/cescobedo/moodle 2019-08-13 12:56:32 +08:00
Andrew Nicols
0bbdef98ea MDL-66384 core: Limit explode to allow subdirs in template names 2019-08-13 11:29:40 +08:00
Adrian Greeve
5918473134 Merge branch 'MDL-66008-master-fix' of https://github.com/lameze/moodle 2019-08-13 10:27:31 +08:00
Simey Lameze
4d98566939 MDL-66008 core_calendar: fix behat failures 2019-08-13 09:50:48 +08:00
Ryan Wyllie
30d2b9cd31 MDL-66110 dml: Fix MySQL v8 compatibility with groups table
MySQL v8 has added "groups" to the reserved word list. That is used
as a table name in Moodle so we have to quote it with backticks in the
SQL so that MySQL knows it's being used as an identifier.
2019-08-13 09:35:19 +08:00
Jun Pataleta
1946261fb3 Merge branch 'MDL-66288-master' of git://github.com/lameze/moodle 2019-08-12 15:15:14 +08:00
Andrew Nicols
92afad61ae Merge branch 'MDL-65937-master' of git://github.com/junpataleta/moodle 2019-08-12 14:54:20 +08:00
Jun Pataleta
a7faa3f1c5 Merge branch 'MDL-66104' of git://github.com/stronk7/moodle 2019-08-12 14:51:59 +08:00
Simey Lameze
bcd0583e68 MDL-66008 calendar: Remove duplicated call to library funciton
A duplicated call to calendar_get_allowed_event_types has
been removed.
2019-08-12 14:49:40 +08:00
Shamim Rezaie
9175a97822 MDL-46317 admin: minor coding style fixes 2019-08-12 14:44:12 +10:00
Shamim Rezaie
7a8dd5664f MDL-46317 admin: deprecating configuserquota,core_admin lang string 2019-08-12 14:44:12 +10:00
Shamim Rezaie
e945b883fa MDL-46317 admin: convert userquota config from text to filesize widget 2019-08-12 14:44:10 +10:00
Shamim Rezaie
e2d97a4659 MDL-46317 admin: Added admin\local\settings\filesize class 2019-08-12 13:22:24 +10:00
Peter
d439fac53c MDL-52849 core: Focus reader onto popup with ajax errors 2019-08-12 10:45:08 +08:00
Jake Dallimore
612b210d76 MDL-66147 core: add get_time_interval_string()
Returns a formatted string representation of the difference between two
timestamps, defaulting to 'Xd Xh Xm' format, but supporting custom
format strings containing any chars from:
https://www.php.net/manual/en/dateinterval.format.php.
2019-08-12 09:35:51 +08:00
Jake Dallimore
db381d5c87 MDL-66147 mod_assign: Change assign to return calculated instance data
Changes include:
- Added a private method calculate_properties(), which calculates
per-user instance properties and stores them in an instance var.
- get_instance() now takes a userid param, and calls the
calculate_properties() method, allowing per-user instances to be
returned.
- Added a public method get_default_instance(), which returns the
non-augmented instance data (no per-user properties), so we can
still get back the raw instance data when needed.
- The get_course method has been changed to make sure we always have an
object property, not a string - which happened in some cases (when
commenting on the assign submission page, for example).
2019-08-12 09:35:51 +08:00
Simey Lameze
e4b1c14a37 MDL-66288 dataformat: prettify exported JSON data 2019-08-12 07:29:31 +08:00
Ilya Tregubov
64ce596f8c MDL-65925 assign: Grade page broken if submission was deleted. 2019-08-12 09:28:50 +10:00
cescobedo
0504254f1d MDL-59524 general: Remove strings deprecated in 3.4 2019-08-12 00:13:08 +02:00
Matteo Scaramuccia
463421144f MDL-66140 search: Mitigate PECL solr extension regression
Refs:
- https://bugs.php.net/bug.php?id=72740
- https://bugs.php.net/bug.php?id=75631
- https://github.com/php/pecl-search_engine-solr/pull/16
2019-08-11 20:03:25 +02:00
Andrew Nicols
f75cb25c86 MDL-65604 repository: Kill off missing param errors
The file picker template included an img with a src of "#". When the
template was loaded into the modal, the browser fetches the img src, but
it's immediately removed as that section is only used as an in-place
template. The src tag does not need to be present.
2019-08-11 14:51:18 +08:00
AMOS bot
3d9aa96892 Automatically generated installer lang files 2019-08-10 00:11:06 +00:00