moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80004 commits 37 branches 544 tags 1.3 GiB
Commit graph

80004 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
2ab5bbc409 Merge branch 'MDL-55457-master' of https://github.com/xow/moodle 2016-09-05 11:48:34 +08:00
David Monllao
af12b3c663 Merge branch 'wip_MDL-53724_master' of git://github.com/gjb2048/moodle 2016-09-05 11:34:06 +08:00
David Monllao
f1ef913364 Merge branch 'wip-MDL-55707-master' of git://github.com/abgreeve/moodle 2016-09-05 10:46:57 +08:00
Adrian Greeve
9851111f7a MDL-41174 course: Module name change updates calendar. 2016-09-02 11:46:09 +08:00
Marina Glancy
d47af580bd MDL-55826 question: fix PHP7.1 strict warnings 2016-09-02 10:52:02 +08:00
John Okely
d51757a729 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:39:31 +08:00
Gareth J Barnard
efe67d05b2 MDL-53724 themes: Inconsistent padding when >= one blocks are docked. 2016-09-01 18:22:28 +01:00
Tim Hunt
6ae04c2684 MDL-42125 quiz stats: fix regression caused by MDL-51603 2016-09-01 12:38:30 +01:00
Tim Hunt
9e5e0d8de4 MDL-42125 quiz stats: clearer message when manual grading required 2016-09-01 12:34:40 +01:00
Neill Magill
31c62848f0 MDL-55617 backup: Possible fatal errors in backup and restore 
The unserialize() function will not always return an object
especially when as can happen the controller field of a
record in the backup_controllers table is empty.

This change ensures that in this case the script will
not cause a fatal error, but instead throw an error.
 2016-09-01 08:51:25 +01:00
Neill Magill
fefd9fed83 MDL-55618 backup: Header should not be output twice 
Before this patch if the pre-check failed during
the final stage of an import a request for the
page header to be output was made for a second
time, this caused a coding_error to occur.

This change removes the second request to
output the page header, which will allow the user
to see the reasons the pre-check failed.
 2016-09-01 08:43:45 +01:00
John Okely
3b4491e8aa MDL-55742 mod_lti: Remove support for get_magic_quotes_gpc 
Thanks to Bishop Bettini for the original patch.
 2016-09-01 14:58:29 +08:00
David Monllao
5c33a0db21 weekly release 3.2dev 2016-09-01 11:14:03 +08:00
David Monllao
c067ae4f33 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-09-01 11:14:01 +08:00
Adrian Greeve
93d3f310b0 MDL-55707 grades: Stop infinite loop when regrading. 2016-09-01 10:25:13 +08:00
Marina Glancy
6f9f8b59fa MDL-55665 charts: correction to stacked bar charts 2016-09-01 09:17:36 +08:00
Tim Hunt
d0f8daef12 MDL-55815 quiz review: after close should beat immediately after 
This only arises in specific situations: student submitted less than 2
mintues before time close, or when a teacher previews after the close
date. However, in those cases, the old behaviour was confusing. Now,
'After the quiz is closed' takes priority.
 2016-08-31 12:55:21 +01:00
Tim Hunt
daf6becfb0 MDL-55815 quiz: convert attempt state tests to a data provider 2016-08-31 12:54:18 +01:00
David Monllao
f038a3e670 Merge branch 'wip-MDL-38105-master' of https://github.com/marinaglancy/moodle 2016-08-31 09:57:31 +08:00
Rajesh Taneja
31c8fd3e83
MDL-55766 behat: set core behat selectors if not overridden by theme 2016-08-31 07:23:13 +08:00
Eloy Lafuente (stronk7)
4bdb1298c4 Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle 2016-08-30 12:54:46 +02:00
sam marshall
3bf0482841 MDL-55724 Glossary: Prevent infinite loop in trusttext_strip 2016-08-30 10:25:38 +01:00
David Monllao
dacfc6f816 Merge branch 'MDL-55372-master' of git://github.com/danpoltawski/moodle 2016-08-30 16:38:18 +08:00
David Monllao
7db19614f0 Merge branch 'MDL-55452-master' of git://github.com/danpoltawski/moodle 2016-08-30 16:25:28 +08:00
Marina Glancy
dfc261be66 MDL-38105 gradingform_rubric: option to lock 0 level for rubrics 
this also allows using negative scores
 2016-08-30 14:55:43 +08:00
Mark Nelson
8354d12d39 MDL-55771 core: added title attribute when using JS to render {{pix}} 2016-08-30 14:49:44 +08:00
Marina Glancy
0df9dce716 MDL-55581 htmlpurifier: test for attributes in video tag 2016-08-30 13:44:13 +08:00
David Monllao
bb75b82e21 Merge branch 'MDL-54873-master' of git://github.com/andrewnicols/moodle 2016-08-30 12:52:38 +08:00
Andrew Nicols
5e171c6986 MDL-54873 assign: Seed recordid to print_recent_activity 2016-08-30 11:57:57 +08:00
Andrew Nicols
c06ce32d85 MDL-54873 assign: Add recordid fetching participants 
get_submission_info_for_participants is primarily used by externallib.php
 2016-08-30 11:46:21 +08:00
Andrew Nicols
cf29b1e08d MDL-54873 assign: Fetch mapping id for blind marking in cron 2016-08-30 11:46:20 +08:00
Andrew Nicols
4ed4be4988 MDL-54873 assign: Fetch mapping id for blind marking grading 
This change modifies the grading table to pre-seed record ids where they
already exist.

Where they do not exist, they are still fetched.
 2016-08-30 11:46:20 +08:00
Frederic Massart
e5e2f39ed5
MDL-55663 filter: Filters could be incorrectly reported as inactive 2016-08-30 11:22:53 +08:00
David Monllao
8bee2d8df6 MDL-55237 core_component: Fix last namespace level matching 
Thanks to Andreas Grabs for proposing a fix.
 2016-08-30 11:15:27 +08:00
Eloy Lafuente (stronk7)
e6166d9bf7 Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle 2016-08-30 02:28:32 +02:00
Rajesh Taneja
cc0ac30488
MDL-55764 behat: Reset static update db list 
While running multiple suites we should
ensure static cli cache is also reset.
 2016-08-30 08:00:01 +08:00
Eloy Lafuente (stronk7)
ba982fef66 Merge branch 'MDL-55660-master-tablesql' of git://github.com/mudrd8mz/moodle 2016-08-29 18:59:13 +02:00
AMOS bot
25d3cf24c5 Automatically generated installer lang files 2016-08-30 00:04:47 +08:00
Eloy Lafuente (stronk7)
ff536f4b37 Merge branch 'MDL-55667-master-participantslink' of git://github.com/mudrd8mz/moodle 2016-08-29 16:53:46 +02:00
Eloy Lafuente (stronk7)
b5776e1b9f Merge branch 'MDL-55741' of git://github.com/timhunt/moodle 2016-08-29 14:08:37 +02:00
Cameron Ball
0f826e9f36
MDL-55587 core_media: Properly escape ampersand 2016-08-29 19:16:01 +08:00
David Mudrák
57b81c93f5 MDL-55667 navigation: Do not display site participants link to students 
The problem here was that user/index.php checks the system level
capability moodle/site:viewparticipants when the user is on the front
page, and the moodle/course:viewparticipants on non-front pages.

But the navigation displayed the link by mistake even in situations,
when the user has the capability moodle/course:viewparticipants on the
front page (typically when the default role for the front page is set to
student).

Added behat tests for reproducing the bug and also for checking the
basic functionality of the feature.
 2016-08-29 12:11:46 +02:00
David Monllao
c2df528806 Merge branch 'wip-MDL-55581-master' of git://github.com/marinaglancy/moodle 2016-08-29 16:53:46 +08:00
David Monllao
6893691b34 Merge branch 'MDL-55710-master' of git://github.com/lameze/moodle 2016-08-29 14:48:54 +08:00
David Monllao
ea012c47b5 Merge branch 'MDL-55650-master' of https://github.com/sammarshallou/moodle 2016-08-29 14:42:55 +08:00
David Monllao
a74218d464 Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle 2016-08-29 14:40:03 +08:00
David Monllao
351081b06d Merge branch 'MDL-55312_load_timeout_for_amd_modules_master' of https://github.com/gthomas2/moodle 2016-08-29 14:31:11 +08:00
David Monllao
b197b33564 Merge branch 'MDL-55665-master' of git://github.com/lameze/moodle 2016-08-29 13:26:28 +08:00
Marina Glancy
28e27ac837 MDL-55581 htmlpurifier: allow track tag in videos and audios 2016-08-29 13:25:10 +08:00
David Monllao
bc1ac4a89d Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle 2016-08-29 11:18:58 +08:00