Dan Poltawski
83c7b312cd
Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle
2016-12-28 09:13:29 +00:00
Dan Poltawski
20ad9c7b4e
Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle
2016-12-28 08:56:12 +00:00
Dan Poltawski
c4cf1c60f5
weekly release 3.3dev
2016-12-22 08:15:04 +00:00
Dan Poltawski
3a4eba7aa0
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-12-22 08:15:02 +00:00
Adrian Greeve
c496632681
MDL-57292 tool_lpimportcsv: Fix for unit tests.
2016-12-22 13:06:40 +08:00
David Monllao
2f31bea125
Merge branch 'MDL-57187-master-htmlaudiofix' of git://github.com/snake/moodle
2016-12-21 08:02:21 +01:00
Jake Dallimore
c19c53161a
MDL-57187 filter_mediaplugin: fix audio tag height in chrome
...
Chrome's html5 audio tags don't have a height and 'auto' renders them
with zero height, so added a min height to address this.
2016-12-21 13:46:42 +08:00
Rajesh Taneja
ccb2a6a5f8
MDL-56581 behat: Use proper steps to navigate to Permissions
2016-12-21 12:51:17 +08:00
David Mudrák
657fa9db9d
MDL-57474 mailer: Make sure that our exlicit MessageID is trimmed
...
The new version of phpmailer shipped with Moodle 3.2 has added check
that the explicitly provided MessageID matches /^<.*@.*>$/.
Values coming from our overridden moodle_phpmailer::addCustomHeader()
had a whitespace at the start. So the requested value was not used as
the Message-ID header and the default phpmailer value was used.
As a result, forum posts threading was broken in email clients.
2016-12-21 01:20:52 +01:00
Rajesh Taneja
6749b071d9
MDL-53814 behat: Use table step to check for string
2016-12-21 07:35:07 +08:00
AMOS bot
e02c1d2106
Automatically generated installer lang files
2016-12-21 00:03:51 +08:00
Dan Poltawski
1755bf99b4
MDL-56581 boost: add styling for overriden permission highlight
2016-12-20 12:10:08 +00:00
Jes Ackland-Snow
e985a29cdf
MDL-56581 Roles: Permissions override screen not inherited styling
2016-12-20 12:09:01 +00:00
Eloy Lafuente (stronk7)
863e1a66a9
Merge branch 'MDL-56547' of https://github.com/ak4t0sh/moodle
2016-12-20 12:47:54 +01:00
Simey Lameze
71fa2be932
MDL-57114 filemanager: apply btn-sm class to buttons
...
This commit also creates a new css rule to fix the file picker icons misalignment.
2016-12-20 10:34:29 +00:00
David Monllao
d6db7a1d9a
Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
2016-12-20 11:09:39 +01:00
Dan Poltawski
3f56d612ec
MDL-56640 templates: add example content
2016-12-20 10:02:06 +00:00
Dan Poltawski
d83d87f6ac
MDL-56640 yui: remove moodle-core-formautosubmit
...
It's easily achieved with jquery primatives
2016-12-20 10:02:06 +00:00
Dan Poltawski
9c9201ecde
MDL-56640 lesson: switch from YUI to jquery.change()
2016-12-20 10:02:06 +00:00
Dan Poltawski
588b84f78a
MDL-56640 js: yui to jquery for formautosubmit in select templates
...
I did not keep the 'nothing' behaviour in the js because I don't think
the nothing option needs special handling, given that its default
selection.
2016-12-20 10:02:05 +00:00
Dan Poltawski
988a031a61
Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle
2016-12-20 09:19:23 +00:00
Rajesh Taneja
7737744d1b
MDL-53814 behat: Columns have been moved ahead
2016-12-20 11:36:00 +08:00
Eloy Lafuente (stronk7)
de5e61c4ba
Merge branch 'MDL-57268-master' of https://github.com/xow/moodle
2016-12-20 02:22:26 +01:00
Dan Poltawski
caf52b578b
Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle
2016-12-19 15:46:54 +00:00
Dan Poltawski
7d64e2c3bc
Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle
2016-12-19 14:33:05 +00:00
David Monllao
d17b70dda2
MDL-56320 tool_mobile: rest protocol dependency added
2016-12-19 15:11:00 +01:00
David Monllao
ef9a1a2aff
Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle
2016-12-19 15:05:14 +01:00
David Monllao
e3578224cc
Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle
2016-12-19 14:59:13 +01:00
David Monllao
902b32bd1b
Merge branch 'MDL-56527-master' of git://github.com/mudrd8mz/moodle
2016-12-19 14:03:53 +01:00
Dan Poltawski
c67e93b235
MDL-56640 templates: move select templates from boost to core
2016-12-19 12:23:54 +00:00
Dan Poltawski
64e032b6da
Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle
2016-12-19 12:21:06 +00:00
Eloy Lafuente (stronk7)
f4f63fa6b0
Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle
2016-12-19 13:04:16 +01:00
Eloy Lafuente (stronk7)
e857608ba2
Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle
2016-12-19 13:02:09 +01:00
David Monllao
a127f448f0
Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle
2016-12-19 12:54:04 +01:00
David Monllao
eacacae8cc
Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle
2016-12-19 12:46:19 +01:00
Dan Poltawski
dc87f411dd
Merge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle
2016-12-19 11:25:47 +00:00
David Monllao
034996876c
Merge branch 'MDL-57402' of git://github.com/timhunt/moodle
2016-12-19 12:20:57 +01:00
David Monllao
c1c0d9b9cf
Merge branch 'MDL-41729-master' of git://github.com/lameze/moodle
2016-12-19 11:51:43 +01:00
David Monllao
2b5c9f04e3
Merge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https://github.com/lucaboesch/moodle
2016-12-19 11:38:43 +01:00
Dan Poltawski
849002fab9
Merge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle
2016-12-19 08:47:21 +00:00
Dan Poltawski
8560d8e1f9
Merge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle
2016-12-19 08:35:42 +00:00
John Okely
22c98e1e5a
MDL-57268 auth_db: Unit tests for deletion from a large user set
2016-12-19 10:06:55 +08:00
Eloy Lafuente (stronk7)
17e14441c7
Merge branch 'wip-mdl-57344' of https://github.com/rajeshtaneja/moodle
2016-12-19 01:56:02 +01:00
Stephen Bourget
ef36d240c1
MDL-54996 Calendar: Fix dates for future multi-day events
...
Thanks to Martin Cunliffe for providing the fix
2016-12-17 09:48:41 -05:00
Simey Lameze
c4eb68177e
MDL-57292 tool_lpimportcsv: display progress bar for large imports
2016-12-16 10:47:01 +08:00
Mathew May
a446095f17
MDL-52098 enrol: cohort now looks at instance status
2016-12-16 11:18:52 +13:00
Arnaud Trouve
723a9dd9f4
MDL-53044 auth : force change on expired password
2016-12-15 14:49:03 +01:00
Arnaud Trouve
3009095bc9
MDL-56547 admin : add check on user deletion
...
Check if the target user is not already deleted
and print an explicit error in that case.
2016-12-15 14:29:07 +01:00
Dan Poltawski
d0e61e8655
MDL-57293 lang/email: Improve emailvia string
...
* Strip the https? part of url for existing strings
* Switch the string to (via shortname)
2016-12-15 09:54:04 +00:00
Andrew Nicols
5100c486bd
weekly on-sync release 3.3dev
2016-12-15 11:34:52 +08:00
