mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
94,528 Commits 36 Branches 527 Tags
Commit Graph

94528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
9311a83b45 Merge branch 'patch-1' of https://github.com/aspark21/moodle 2019-08-14 11:33:57 +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
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
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
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
cescobedo
0504254f1d MDL-59524 general: Remove strings deprecated in 3.4 2019-08-12 00:13:08 +02:00
Jun Pataleta
8e9e9a5f7e weekly release 3.8dev 2019-08-09 16:23:53 +08:00
Jun Pataleta
e2e7fdb4df Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-08-09 16:23:51 +08:00
Jun Pataleta
a6489fabbf Merge branch 'MDL-65679-master-fix' of git://github.com/andrewnicols/moodle 2019-08-09 11:38:59 +08:00
Andrew Nicols
7be52eb255 MDL-65679 assignfeedback_editpdf: Adjust z-indexes for editpdf 2019-08-09 08:34:29 +08:00
Jun Pataleta
7f18f22fac Merge branch 'MDL-66272-master' of git://github.com/vmdef/moodle 2019-08-08 12:43:51 +08:00
Amaia Anabitarte
82ca410f23 MDL-60636 behat: Fixing modified xpath 2019-08-08 11:58:03 +08:00
Andrew Nicols
419a67aad3 Merge branch 'MDL-65933-master' of git://github.com/junpataleta/moodle 2019-08-08 11:41:50 +08:00
Jun Pataleta
d3455c0da1 Merge branch 'MDL-59470' of https://github.com/Chocolate-lightning/moodle 2019-08-08 10:40:51 +08:00
Mathew May
7456bf413b MDL-59470 admin: Add Behat test for duplicating a tour 2019-08-08 10:30:12 +08:00
Andrew Nicols
9f0cf3e855 Merge branch 'MDL-65595-master' of git://github.com/peterRd/moodle 2019-08-08 10:28:15 +08:00
Jun Pataleta
07d00f0548 Merge branch 'MDL-64032-master-fix' of https://github.com/andrewnicols/moodle 2019-08-08 10:23:10 +08:00
Andrew Nicols
b6a226f96f MDL-64032 user: Comment out failing behat tests 
These are failing because of an unrelated issue which is possibly quite
an edge case.
 2019-08-08 09:31:00 +08:00
Mathew May
71fd7b1139 MDL-59470 behat: Add a element comtains x occurrences step 2019-08-08 09:16:19 +08:00
Mathew May
c48fbb6c9b MDL-59470 admin: A user tour can now be duplicated 2019-08-08 09:16:17 +08:00
Jun Pataleta
7fda7cf71b Merge branch 'MDL-57239' of https://github.com/timhunt/moodle 2019-08-08 08:49:56 +08:00
Jun Pataleta
30c8bf169e Merge branch 'MDL-50346-master' of git://github.com/andrewnicols/moodle 2019-08-07 17:11:31 +08:00
Andrew Nicols
08bec34297 Merge branch 'MDL-66039-master' of git://github.com/bmbrands/moodle 2019-08-07 15:31:43 +08:00
Brendan Heywood
32f805e079 MDL-66278 core: Add callback to show other password checks on signup 2019-08-07 14:12:04 +08:00
Jun Pataleta
9897d03d95 Merge branch 'MDL-56789-master' of git://github.com/rezaies/moodle 2019-08-07 14:01:39 +08:00
Sara Arjona
96d497204f Merge branch 'MDL-61649-master' of git://github.com/aanabit/moodle 2019-08-07 13:33:04 +08:00
Shamim Rezaie
f73b22a3ac MDL-56789 core: Improve unit tests 2019-08-07 15:25:16 +10:00