80052 Commits

Author SHA1 Message Date
Dan Poltawski
1f2744851f weekly release 3.2dev 2016-09-15 11:14:54 +01:00
Dan Poltawski
a8cf3454ce Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-09-15 11:14:52 +01:00
David Monllao
37a8e5223d Merge branch 'MDL-55945-master' of https://github.com/snake/moodle 2016-09-15 12:38:43 +08:00
Jake Dallimore
db8c2cf6d4 MDL-55945 login: fix https support for forgot_password.php 2016-09-15 09:19:39 +08:00
Andrew Nicols
8bdd97a35a MDL-54872 mod_assign: Allocate Unique IDs before tests 2016-09-14 09:20:33 +08:00
Eloy Lafuente (stronk7)
b5830334e7 Merge branch 'wip-mdl-55466' of https://github.com/rajeshtaneja/moodle 2016-09-14 01:38:51 +02:00
Rajesh Taneja
234e1449a1
MDL-55466 lib: Create clean alternateloginurl 2016-09-14 07:37:08 +08:00
Dan Poltawski
5d602e314b Merge branch 'wip-MDL-55864-master' of git://github.com/marinaglancy/moodle 2016-09-13 14:56:27 +01:00
Dan Poltawski
eb81115f20 Merge commit '2bcef5594aa7aef9329e750210f09c8cd506c85b' 2016-09-13 10:05:57 +01:00
Dan Poltawski
3ec4a8085c Merge branch 'MDL-55791_master' of https://github.com/Syxton/moodle 2016-09-13 09:40:33 +01:00
Ryan Wyllie
2bcef5594a MDL-55727 javascript: Add modal module 2016-09-13 02:44:30 +00:00
David Monllao
c46432ad6c Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle 2016-09-13 10:05:26 +08:00
Marina Glancy
9e21f12dbd MDL-55864 general: fix PHP7.1 strict warnings 2016-09-13 09:39:26 +08:00
Eloy Lafuente (stronk7)
ed55d47d03 Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle 2016-09-12 19:37:40 +02:00
Eloy Lafuente (stronk7)
9579b52372 Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle 2016-09-12 19:19:45 +02:00
Eloy Lafuente (stronk7)
4e25d5e5ea Merge branch 'wip-MDL-55654-master' of git://github.com/marinaglancy/moodle 2016-09-12 19:14:00 +02:00
Eloy Lafuente (stronk7)
61b246fd0e Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle 2016-09-12 19:12:26 +02:00
Eloy Lafuente (stronk7)
9d821b6faf Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle 2016-09-12 18:29:42 +02:00
AMOS bot
415fb6ca10 Automatically generated installer lang files 2016-09-13 00:04:35 +08:00
Eloy Lafuente (stronk7)
fa7c2bd050 Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle 2016-09-12 17:54:59 +02:00
Eloy Lafuente (stronk7)
b8c5fc8620 Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle 2016-09-12 17:34:21 +02:00
Matt Davidson
59c66f926f MDL-55791 admin: maintenance mode access capability
Add capability to allow certain non-admin users through maintenance
mode.
2016-09-12 10:37:25 -04:00
Dan Poltawski
2a786e7bad Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle 2016-09-12 12:17:40 +01:00
Dan Poltawski
0fcbfb63a5 Merge branch 'wip-mdl-55353' of https://github.com/rajeshtaneja/moodle 2016-09-12 11:49:33 +01:00
Dan Poltawski
3e6ac53831 Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle 2016-09-12 11:36:18 +01:00
Dan Poltawski
4bbe995c89 Merge branch 'wip-mdl-55610' of https://github.com/rajeshtaneja/moodle 2016-09-12 10:18:18 +01:00
David Monllao
a8a75c865f Merge branch 'MDL-55122-master' of git://github.com/lameze/moodle 2016-09-12 12:49:27 +08:00
David Monllao
7f09438a49 Merge branch 'MDL-55626-MASTER' of git://github.com/lazydaisy/moodle 2016-09-12 12:37:44 +08:00
Marina Glancy
721e2def56 MDL-55123 forms: do not call non-static methods statically
this breaks in PHP7.1
2016-09-12 12:06:18 +08:00
Marina Glancy
64c45a2928 MDL-55123 forms: correctly create elements in unittests 2016-09-12 11:56:04 +08:00
David Monllao
1e4233434b Merge branch 'MDL-55873-master' of git://github.com/lameze/moodle 2016-09-12 11:55:51 +08:00
Simey Lameze
90d8bf59e7 MDL-55873 login: change back username fields to use PARAM_RAW 2016-09-12 11:49:14 +08:00
Andrew Nicols
eb4c466162 MDL-54872 assign: Order blindly marked assignments more blindly 2016-09-12 09:29:45 +08:00
Ryan Wyllie
e845b96b83 MDL-55727 javascript: add custom interaction event module 2016-09-12 01:22:20 +00:00
Ryan Wyllie
57a4aba799 MDL-55727 templates: add loading icon template 2016-09-12 01:22:19 +00:00
lazydaisy
8133912c6f MDL-55626 theme_clean: Fixed clean theme missing desktop-first-column 2016-09-10 01:18:29 +01:00
Marina Glancy
88c9c42da2 MDL-55654 user: apply format_string to field names 2016-09-09 14:31:16 +08:00
Rajesh Taneja
3c0b682d39
MDL-55353 behat: Ensure teacher edit activity at different time
Recent activity is showing activities which were
updated since user last logged in and first modification
done on the activity. So ensure update happens at different
time than activity created.
2016-09-09 10:14:05 +08:00
Simey Lameze
02d6873ff0 MDL-55122 enrol: remove duplicated updown variable 2016-09-09 08:48:00 +08:00
Simey Lameze
ddd6bea1c7 MDL-53893 core_badges: Behat for all selected roles award badges 2016-09-09 08:40:48 +08:00
Simey Lameze
294f7773db MDL-53893 core_badges: Add strictness to manual badge criteria 2016-09-09 08:40:48 +08:00
David Monllao
1ef29fd28f MDL-55755 search: Correct event link 2016-09-09 07:57:22 +08:00
Adrian Greeve
a14cde804e MDL-55505 mod_assign: Editing previous attempt works correctly.
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
2016-09-08 20:31:05 +08:00
Dan Poltawski
0344082208 weekly release 3.2dev 2016-09-08 10:25:48 +01:00
Dan Poltawski
3989f4597c Merge branch 'MDL-55504_no-phpunit-utils' of git://github.com/dmonllao/moodle 2016-09-08 09:15:14 +01:00
David Monllao
30fbc3ecab MDL-55504 profiling: No profiling for PHPUNIT_UTIL stuff 2016-09-08 15:32:46 +08:00
Dan Poltawski
d6713a430e MDL-55874 report_particiption: fix invalid html
When messaging disabled.
2016-09-08 08:03:05 +01:00
David Monllao
1e1fa3a23e weekly release 3.2dev 2016-09-08 13:56:33 +08:00
Rajesh Taneja
ec757a2ef9
MDL-55415 phpunit: Option values are set to false by default 2016-09-08 07:11:10 +08:00
Eric Merrill
1aaead91f9 MDL-55725 search: Index proper time modified with indexed files 2016-09-07 17:33:28 -04:00