mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-01 22:42:35 +02:00
Code Issues Projects Releases Wiki Activity
84,957 Commits 36 Branches 528 Tags
Commit Graph

84957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
bef9a71934 MDL-58851 lti: Fix undefined var PHP notice 2017-07-10 14:26:24 +02:00
David Monllao
7fd09e2471 Merge branch 'lti_admin' of https://github.com/baholladay/moodle 2017-07-10 14:25:24 +02:00
Bryan Holladay
1aa11df72f MDL-58851 LTI module: Add LTI admin role capability 
Adding a new 'mod/lti:admin' capability and passes the LTI admin role if the user has the 'mod/lti:admin' capability.
 2017-07-10 08:19:48 -04:00
David Monllao
4b0518a834 Merge branch 'MDL-58332-master' of git://github.com/ryanwyllie/moodle 2017-07-10 14:19:31 +02:00
Dan Poltawski
f04b6af7d7 Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle 2017-07-10 13:15:21 +01:00
Eloy Lafuente (stronk7)
6248b5ba63 Merge branch 'MDL-59452-master-filetypesbehat' of git://github.com/mudrd8mz/moodle 2017-07-10 12:19:09 +02:00
Dan Poltawski
1a54672fe6 Merge branch 'MDL-58957-master' of https://github.com/sammarshallou/moodle 2017-07-10 11:15:00 +01:00
David Monllao
1d0dd2072c Merge branch 'wip-MDL-56579-master-2' of git://github.com/marinaglancy/moodle 2017-07-10 12:04:14 +02:00
Dan Poltawski
04d1f77644 Merge branch 'MDL-58544-master' of git://github.com/damyon/moodle 2017-07-10 08:36:40 +01:00
Eloy Lafuente (stronk7)
2ae3581d63 Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle 2017-07-10 04:25:23 +02:00
Ryan Wyllie
7f805edb38 MDL-58332 message: remove concat in get_popup_notifications sql 
Removed the concat to generate the uniqueid field for the popup
notifications data. The concat can't be used directly in the SQL because
the syntax changes between databases. The sql_concat helper can't be
used because it assumes all values are database columns (which they
aren't in this case).

Instead I've just removed the uniqueid field because it isn't required
for the union all to work and the field isn't being used by anything.
This should fixed the compatibility issues between databases.
 2017-07-10 02:02:26 +00:00
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
AMOS bot
cc738fb8b4 Automatically generated installer lang files 2017-07-07 00:06:17 +08: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
Simey Lameze
b9e9ff8830 MDL-59456 auth_cas: patch phpCAS auth bypass vulnerability 2017-07-06 09:30:53 +01: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
Juan Leyva
b6f70a3745 MDL-58716 auth: New ajax WS core_auth_request_password_reset 2017-07-04 11:40:12 +01:00