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

94496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Shamim Rezaie
36272110ba MDL-56789 core: Recycle bin warn only if a grade item is being deleted 2019-08-07 15:25:11 +10:00
Shamim Rezaie
6cdf0207ff MDL-56789 core: Added unit test for course_modules_pending_deletion 2019-08-07 14:18:11 +10:00
Andrew Nicols
0261d1effa MDL-50346 core: Allow sub-directories in template names 2019-08-07 11:44:49 +08:00
Jun Pataleta
cb6e7dc70c Merge branch 'MDL-59639-master' of git://github.com/bmbrands/moodle 2019-08-07 11:29:32 +08:00
Amaia Anabitarte
c7f88457cd MDL-61649 email: Send plain/html format emails based on user preference 2019-08-07 11:20:02 +08:00
Sara Arjona
ab1fa2dbac Merge branch 'MDL-63198-master' of git://github.com/rezaies/moodle 2019-08-07 11:07:50 +08:00
Andrew Nicols
638097810d Merge branch 'mdl-66280' of https://github.com/Peterburnett/moodle 2019-08-07 10:22:04 +08:00
Sara Arjona
600d8df255 Merge branch 'MDL-60636-master' of git://github.com/bmbrands/moodle 2019-08-07 10:00:44 +08:00
Andrew Nicols
91d50e2eda Merge branch 'MDL-57618-master' of git://github.com/cescobedo/moodle 2019-08-06 15:56:07 +08:00
Sara Arjona
a12718673a Merge branch 'MDL-64598-master' of https://github.com/lucaboesch/moodle 2019-08-06 15:29:52 +08:00
Bas Brands
fbd99bbb00 MDL-59639 theme_boost: remember last visited tab 2019-08-06 08:54:23 +02:00
Andrew Nicols
c0535be52a Merge branch 'MDL-66234_master' of git://github.com/dmonllao/moodle 2019-08-06 14:25:20 +08:00
Sara Arjona
e9fc5a7381 Merge branch 'MDL-65786-master' of git://github.com/rezaies/moodle 2019-08-06 14:19:17 +08:00
Jun Pataleta
9744897d27 Merge branch 'MDL-66306-master' of git://github.com/lameze/moodle 2019-08-06 14:03:17 +08:00
Simey Lameze
02523182f9 MDL-66306 lib: upgrade moodle lib docs 2019-08-06 13:59:37 +08:00
Simey Lameze
f0f88f7f2b MDL-66306 lib: update phpmailer to 6.0.7 2019-08-06 13:48:28 +08:00
Andrew Nicols
c79835aef9 Merge branch 'MDL-64953' of https://github.com/Chocolate-lightning/moodle 2019-08-06 13:20:54 +08:00
Andrew Nicols
f6666a7064 Merge branch 'MDL-65679-master' of git://github.com/mihailges/moodle 2019-08-06 13:17:43 +08:00
Andrew Nicols
9a74e4008a Merge branch 'MDL-65651-master' of https://github.com/lucaboesch/moodle 2019-08-06 11:57:56 +08:00
Mathew May
28cbff4a2d MDL-64953 templates: Add example contexts & documentation 
This is a follow up from CiBot warnings from MDL-58428
 2019-08-06 10:56:16 +08:00
Andrew Nicols
1108ccba62 Merge branch 'MDL-66034-master' of git://github.com/lameze/moodle 2019-08-06 09:30:14 +08:00
Andrew Nicols
f8c927a25b Merge branch 'MDL-66178' of https://github.com/paulholden/moodle 2019-08-06 09:17:29 +08:00
Andrew Nicols
8b6e767094 Merge branch 'MDL-65992' of git://github.com/Chocolate-lightning/moodle 2019-08-06 09:13:15 +08:00
Eloy Lafuente (stronk7)
0e5f6317c1 Merge branch 'MDL-66307' of https://github.com/timhunt/moodle 2019-08-05 13:30:46 +02:00
Eloy Lafuente (stronk7)
09287bf893 Merge branch 'MDL-64757-38_core_output_nested_template_block_string_language' of https://github.com/tomdickman/moodle 2019-08-05 13:13:33 +02:00
Andrew Nicols
6bfdb36e0b Merge branch 'MDL-33884' of https://github.com/timhunt/moodle 2019-08-05 14:33:11 +08:00