Commit graph

82484 commits

Author SHA1 Message Date
Philipp Hager
29df1cade1 MDL-57198 course: add css-classes to restrictbygroup-button 2016-12-08 13:24:18 +01:00
Dan Poltawski
5ef81f2b0b weekly on-sync release 3.3dev 2016-12-08 08:43:19 +00:00
Dan Poltawski
d87177ae35 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-12-08 08:43:18 +00:00
Ryan Wyllie
568c785fda MDL-55782 groups: wrap long group names (theme: boost)
In the groups UI if a group name is very long it now no longer underlaps
the user column on its right hand side.
2016-12-08 06:36:19 +00:00
Andrew Nicols
d52a665eea Merge branch 'wip-MDL-56614-fix2' of https://github.com/marinaglancy/moodle 2016-12-08 13:50:34 +08:00
Franziska Hübler
b143191855 MDL-55809 glossary: Keep file author and license across import/export 2016-12-08 12:25:34 +08:00
Ilya Tregubov
b6b38f77ba MDL-55906 table: Update user preferences table when reset preferences 2016-12-08 15:02:04 +11:00
Marina Glancy
ef0d68e9b5 MDL-56614 behat: add missing wait for page is ready 2016-12-08 10:50:04 +08:00
Andrew Nicols
64ad7319ab Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle 2016-12-08 10:44:49 +08:00
John Okely
f853640801 MDL-57278 signup: Fix double encoding of confirmation links 2016-12-08 10:16:30 +08:00
John Okely
a6db4a68e2 MDL-57278 signup: Unit tests covering confirmation link generation 2016-12-08 10:16:29 +08:00
Lukas Hämmerle
056a5138a4 MDL-41729 auth_shibboleth: Allow password change for shibboleth users
This patch modifies can_change_password() and adds change_password_url() to allow Shibboleth users to change their password
in case there is an (external) password change URL defined in Moodle. If no such URL is defined, the behaviour is the same
as without the proposed change.

Thanks FH-HWZ.ch for the contribution.
2016-12-08 09:38:52 +08:00
Rajesh Taneja
bd755b5317
MDL-57314 behat: Press enter after setting password unmask 2016-12-08 09:18:39 +08:00
Eloy Lafuente (stronk7)
383b2f9eb6 Merge branch 'wip-mdl-56642' of https://github.com/rajeshtaneja/moodle 2016-12-08 00:36:25 +01:00
Rajesh Taneja
79cb27179a
MDL-56642 dataformat: Fixed method_exits parameters 2016-12-08 07:20:21 +08:00
AMOS bot
ac19ac93ca Automatically generated installer lang files 2016-12-08 00:04:57 +08:00
Dan Poltawski
ee1f658207 Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle 2016-12-07 10:16:54 +00:00
Dan Poltawski
eec60baeca Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle 2016-12-07 08:45:16 +00:00
=
efafa567e4 MDL-55782 groups: wrap long group names
In the groups UI if a group name is very long it now no longer underlaps the user
column on its right hand side.
2016-12-07 09:34:46 +01:00
Andrew Nicols
86f4236cc2 Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle 2016-12-07 14:56:49 +08:00
Marina Glancy
c0ad000f46 MDL-56614 behat: corrections to new steps 2016-12-07 13:37:49 +08:00
Andrew Nicols
4b2bcd2376 Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle 2016-12-07 11:53:34 +08:00
Rajesh Taneja
451ae0cabc
MDL-56353 behat: Added test for multi select dependency 2016-12-07 11:30:46 +08:00
Adrian Greeve
d8ecf9754e MDL-57299 Atto: Theme boost fix for manage files.
Theme boost removed a selector that was being used
to remove used files and so the page wasn't loading
properly.
2016-12-07 10:40:39 +08:00
Andrew Nicols
e4621f0775 Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle 2016-12-07 10:00:30 +08:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Andrew Nicols
3e9f3e30b2 Merge branch 'MDL-56240' of git://github.com/stronk7/moodle 2016-12-07 09:50:16 +08:00
Andrew Nicols
3b8cf77689 Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle 2016-12-07 09:42:20 +08:00
Marina Glancy
1491f21554 MDL-56642 dataformat: set temp dir
Thanks to Chien Wen-Chang for proposing a patch
2016-12-07 09:30:14 +08:00
Andrew Nicols
00f6e2cc52 Merge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle 2016-12-07 09:00:22 +08:00
Rajesh Taneja
63be664507
MDL-57137 behat: Subcategory has black space before name 2016-12-07 08:49:04 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
AMOS bot
c545551a0a Automatically generated installer lang files 2016-12-07 00:04:51 +08:00
Dan Poltawski
be1b12490e Merge branch 'MDL-45873' of https://github.com/bostelm/moodle 2016-12-06 15:56:23 +00:00
Dan Poltawski
b864c7fa1d Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle 2016-12-06 15:50:36 +00:00
Dan Poltawski
c4d9fd1afe Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle 2016-12-06 12:48:09 +00:00
Dan Poltawski
dee51f01d6 Merge branch 'MDL-56836-master' of https://github.com/snake/moodle 2016-12-06 12:46:19 +00:00
Dan Poltawski
369382f7bf Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle 2016-12-06 12:42:00 +00:00
Dan Poltawski
8a08d016ff MDL-56778 enrol: add note about legacy css 2016-12-06 12:31:57 +00:00
Dan Poltawski
94d950601c Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle 2016-12-06 12:30:28 +00:00
Dan Poltawski
e2838e0e5d Merge branch 'MDL-57199' of git://github.com/timhunt/moodle 2016-12-06 12:25:36 +00:00
Dan Poltawski
7cdc6974d4 Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle 2016-12-06 11:08:08 +00:00
Grzegorz Ziółek
3118ff6f41 MDL-56830 config_log: Add block plugin visibility changes to config_log. 2016-12-06 11:29:02 +01:00
Nadav Kavalerchik
4b80e95c73 MDL-57056 Theme/Boost: Fix "Skip to" link when Tab key pressed 2016-12-06 09:55:11 +02:00
SSRF
7829997343 MDL-53677 tool_spamcleaner: CSRF Fix
Resolves minor CSRF within Moodle spamcleaner.
2016-12-06 12:25:14 +05:30
Andrew Nicols
3bb4ad7521 Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle 2016-12-06 14:52:32 +08:00
Andrew Nicols
afecb4dfd5 Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle 2016-12-06 14:34:06 +08:00
Ankit Agarwal
59def6f397 MDL-57284 boost: Fix booktool_print icons 2016-12-06 11:51:02 +05:30
Mark Nelson
07af06df96 MDL-57283 core: fixed function call on null 2016-12-06 14:12:42 +08:00
Andrew Nicols
7586a36022 Merge branch 'MDL-56301-master' of https://github.com/snake/moodle 2016-12-06 14:10:40 +08:00