Commit graph

85577 commits

Author SHA1 Message Date
Jake Dallimore
350700bf8b weekly release 3.4dev 2017-07-07 12:10:12 +08:00
Jake Dallimore
a51401a189 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-07-07 12:10:10 +08:00
Marina Glancy
63470cf31c MDL-59468 theme: bug fix accessing db during install 2017-07-07 11:11:50 +08:00
Dan Marsden
e63d7244a6 MDL-58863 scorm: Improve accessibility when css disabled. 2017-07-07 10:40:13 +12:00
AMOS bot
cc738fb8b4 Automatically generated installer lang files 2017-07-07 00:06:17 +08:00
Neill Magill
22481f3d89 MDL-59317 message: Message page taking long time to load
The OR clause in these queries used different sets of columns to select
userid which meant that the indexes that included user id could not be
used.

This change splits the query so that each individual part can use one of
the indexes that includes a userid which speeds them up considerably.
2017-07-06 15:24:02 +01:00
Neill Magill
733c4978fc MDL-52501 assign: Fix group submissions without submission record
Based on work by Tim Lock <tim.lock@blackboard.com>

While upgrading to Moodle 2.8 or above it is possible for it to fail if
the site has multiple graded attempts for a user without an associated
submission record. This caused the upgrade to violate the databases
unique key rules.

This same issue could apply to a backup that was created of an
assignment that had this issue, when it is restored into Moodle 2.8 or
later.

This change adds the attempt number from the grade table into the query
that is inserting the new submission record (thanks to Tim). It also
moves the insert query before the latest flag is set on submission
records to ensure that only one has it, without this it is possible that
multiple submission records would be marked as the latest after an
upgrade or restore.
2017-07-06 15:23:40 +01:00
Eloy Lafuente (stronk7)
da120d408c Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle 2017-07-06 15:34:43 +02:00
Mark Nelson
a6a65da4f3 MDL-59395 core_user: removed unnecessary Behat javascript tags
1) Fixes a failing Behat test.
2) Speeds up two tests (including one fixed above).

Part of MDL-59290.
2017-07-06 21:26:02 +08:00
Mark Nelson
272094b8aa MDL-59395 report_log: removed unnecessary Behat javascript tags
Reverts the original fix for the failing Behat tests and solves
it in a better way - it is now faster!

Part of MDL-59290.
2017-07-06 21:26:02 +08:00
David Mudrák
fd8fe9c1db MDL-56486 workshop: Add behat tests for restricting file types 2017-07-06 12:31:26 +02:00
Simey Lameze
b9e9ff8830 MDL-59456 auth_cas: patch phpCAS auth bypass vulnerability 2017-07-06 09:30:53 +01:00
David Mudrák
b8b07ce2c4 MDL-56486 workshop: Deprecate custom methods for handling file types
The functionality and the tests are now part of the core element.
2017-07-06 09:49:04 +02:00
David Mudrák
9ef238bc84 MDL-56486 workshop: Use filetypes utility class to normalize file types 2017-07-06 09:49:04 +02:00
David Mudrák
5a0865a1b1 MDL-56486 workshop: Use filetypes utility class to check submitted files 2017-07-06 09:49:04 +02:00
David Mudrák
f9a8d98047 MDL-56486 workshop: Use the new filetypes element in the mod_form
The element copes well with the legacy syntax - just extensions, no
dots. So the upgrade step is not actually necessary here. The element
has in-built validation so there is no need to validate it explicitly
here again.
2017-07-06 09:49:04 +02:00
David Mudrák
ee7e8fdf8e MDL-59443 forms: Add behat tests for the field validation 2017-07-06 09:29:04 +02:00
David Mudrák
a100469875 MDL-59443 forms: Consider '*' as a known file type
While working on the filetypes element validation, I realized we did not
cover the case of selecting 'Any file type'. So the value '*' was
falsely reported as unknown file type.
2017-07-06 09:29:04 +02:00
David Mudrák
572d6fdef3 MDL-59443 forms: Allow implicit validation of filetypes element values
The validation obeys the element options 'allowall', 'allowunknown' and
'onlytypes' passed when creating the element.
2017-07-06 09:29:04 +02:00
David Mudrák
6c8e25fa51 MDL-59443 forms: Give elements a chance to validate submitted values
This patch introduces support for an optional method provided by the
form element classes to validate the submitted values implicitly -
without the need to have the rule explicitly added via the form
definition.

I am aware this should ideally be added to the HTML_QuickForm_element
parent class. But I wanted to avoid modification of that third party
library and keep the change in the moodleform layer only.
2017-07-06 09:29:04 +02:00
David Mudrák
6b59e4aafb MDL-59452 forms: Add Behat test for the filetypes form element
This is a very basic test for now to illustrate that it is possible now
to specify filetypes fields by the label.
2017-07-06 09:22:14 +02:00
Jake Dallimore
d5d70e57a4 Merge branch 'MDL-59395_master-fix' of github.com:markn86/moodle 2017-07-06 15:20:41 +08:00
Mark Nelson
7a1c830b0b MDL-59395 core_user: fixed random PHPUnit failure
Part of MDL-59290.
2017-07-06 14:54:41 +08:00
Jake Dallimore
bdbffe0efc Merge branch 'MDL-59364-master-fix2' of http://github.com/damyon/moodle 2017-07-06 14:48:05 +08:00
Damyon Wiese
40f6d24725 MDL-59364 behat: Brief / full links removed
The selector for brief / full user details was removed, it needs removing from the behat test.
2017-07-06 14:37:59 +08:00
Mark Nelson
688892d66f MDL-59395 report_log: fixed step navigating to user profile
Part of MDL-59290.
2017-07-06 13:20:04 +08:00
Jake Dallimore
11f512ee06 Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle 2017-07-06 11:54:48 +08:00
Mark Nelson
661750afc2 MDL-59396 block_participants: removed Behat reference to deleted select
Part of MDL-59290.
2017-07-06 11:17:02 +08:00
David Mudrák
9aabf267ee MDL-59452 forms: Provide a label for the filetypes input field
This is a pragmatic (read: hacky) solution of the problem that
Behat/Mink is unable to locate the input field within the filetypes
group. I've spent a while trying to figure out how to make it work. On
the road, I've discovered that our situation with labels of mform group
elements is a bit messy. And generally there seems to be no easy way how
to use the group's label to identify one particular input field in the
group.

In this case, we use mform group but in fact there is a single input
field within the group. Mink does not locate the group itself as an
input field and throws ElementNotFoundException. So reusing the group's
label as a hidden label for the input makes sense from certain
perspective.

The potential drawback (unconfirmed) is that screen readers might read
the same label text twice. But only one of them is associated with the
actual input field so chances are they would ignore the group's one,
like Mink does.
2017-07-05 17:38:04 +02:00
Jun Pataleta
3a2304f99b MDL-58651 logstore_database: Set dbhandlesoptions in test page 2017-07-05 22:49:44 +08:00
Eloy Lafuente (stronk7)
58da7e8851 Merge branch 'MDL-57021-master-v2' of git://github.com/danpoltawski/moodle 2017-07-05 12:24:45 +02:00
Eloy Lafuente (stronk7)
92acc71388 Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle 2017-07-05 12:00:12 +02:00
Eloy Lafuente (stronk7)
aef0609316 Merge branch 'MDL-59398-master-enfix' of git://github.com/mudrd8mz/moodle 2017-07-05 11:51:05 +02:00
Eloy Lafuente (stronk7)
a590ff736c Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle 2017-07-05 09:42:41 +02:00
Eloy Lafuente (stronk7)
9a334cb444 Merge branch 'MDL-58286-master' of https://github.com/xow/moodle 2017-07-05 09:39:21 +02:00
Eloy Lafuente (stronk7)
29dcef0b65 Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle 2017-07-05 09:34:19 +02:00
Helen Foster
f08d4da505 MDL-59398 lang: Merge English strings from the en_fix language pack 2017-07-05 09:27:29 +02:00
Mark Nelson
ba6645daa0 MDL-59395 core_user: added unit tests for new participation functions
Part of MDL-59290.
2017-07-05 14:51:41 +08:00
Mark Nelson
bc47b70667 MDL-59395 core_user: move participants table to own class
Removed the edit link variable which was used in the heading
'Users with the role ..' but was never displayed due to filters.

Other minor tidy ups as well.

Part of MDL-59290.
2017-07-05 14:51:41 +08:00
Jake Dallimore
e166657532 Merge branch 'MDL-58716-master-fix' of git://github.com/junpataleta/moodle 2017-07-05 13:03:56 +08:00
Jun Pataleta
64755ee800 MDL-58716 core: Define core_login_testsuite in phpunit.xml.dist 2017-07-05 12:39:18 +08:00
Marina Glancy
1c885118fc MDL-59412 course: do not display completion icon for unavailable mod 2017-07-05 09:48:18 +08:00
John Okely
d349b0f0f8 MDL-58286 enrol_ldap: Pass connection to ldap_paged_results_supported
Thanks to Bianco Veigel for the original patch.
2017-07-05 09:46:27 +08:00
Jun Pataleta
a50089bac5 Merge branch 'MDL-58716-master' of git://github.com/jleyva/moodle 2017-07-05 09:36:41 +08:00
Eloy Lafuente (stronk7)
39f8a9636e Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle 2017-07-05 02:35:26 +02:00
Eloy Lafuente (stronk7)
8eb4f41f1d Merge branch 'MDL-59396_master' of git://github.com/markn86/moodle 2017-07-05 02:33:09 +02:00
Eloy Lafuente (stronk7)
5133e30da3 Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle 2017-07-05 02:31:48 +02:00
Eloy Lafuente (stronk7)
acbcffd342 Merge branch 'MDL-58651' of git://github.com/aolley/moodle 2017-07-05 01:21:13 +02:00
Eloy Lafuente (stronk7)
77c8eb94c3 Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle 2017-07-04 19:58:51 +02:00
Eloy Lafuente (stronk7)
f75b93c9d3 Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle 2017-07-04 19:44:07 +02:00