Dan Poltawski
79be02bf8d
Merge branch 'MDL-57417-master' of https://github.com/snake/moodle
2016-12-28 21:19:00 +00:00
David Monllao
564630322c
Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle
2016-12-28 12:22:52 +01:00
David Monllao
cc31be4ffc
Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle
2016-12-28 11:45:34 +01:00
Dan Poltawski
66b68d631d
Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle
2016-12-28 10:32:50 +00:00
David Monllao
f32ff507e2
Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle
2016-12-28 10:58:13 +01: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
0e34e46fd0
MDL-56488 boost: validate scss settings for parsable scss
...
* Parses the scss and fails validation if a parse error is found
* Does not detect the situation when variables are not present - this
would involve us parsing the entire tree and would be slow. It could
also change over time, depending on whats defined in the scss
from themes.
* Introduces a new admin_setting_scsscode to do this
2016-12-23 09:51:29 +00:00
Jake Dallimore
c41883f0bb
MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope
2016-12-23 08:40: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
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
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
Adrian Greeve
920edec857
MDL-57251 navigation: Correct permission shows site admin
...
If the user does not have the moodle/site:configview
capability then do not show them the site administration
link.
2016-12-20 12:51:51 +08:00
Adrian Greeve
b1eb88a4e0
MDL-57251 administration: Updated coursecreator role.
...
The coursecreator role now has the moodle/site:configview
capability so that they have access to the required admin
pages.
2016-12-20 12:51:51 +08:00
Dan Poltawski
caf52b578b
Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle
2016-12-19 15:46:54 +00:00
David Monllao
ef9a1a2aff
Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle
2016-12-19 15:05:14 +01:00
Dan Poltawski
c67e93b235
MDL-56640 templates: move select templates from boost to core
2016-12-19 12:23:54 +00: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
Dan Poltawski
89556019c0
MDL-57450 enviroment: remove tls library check
...
Unfortunately it has come to light that the version sniffing is just not
reliable at all, operating system vendors backport security patches to
older versions - so in many cases we reporting a problem which is not a
problem. False positives and the solution to self-compile or something
like php will be causing more harm than good.
2016-12-19 10:55:07 +00:00
Rafal Domagalski
43bcc4b4ad
MDL-52366 themes: check for templates in themedir
2016-12-16 13:32:08 +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
Damyon Wiese
08d7c0e1ca
MDL-57386 blocklib: wrong variable in is_block_present
...
This isn't reachable code in core moodle, but themes/plugins could call is_block_present to trigger it.
2016-12-15 10:50:44 +08:00
Rajesh Taneja
b3a2a33f07
MDL-57380 behat: Check for list tags and text
...
after list tag span can be added on few browsers
like chrome 51.0, so test if text starts with
list tag and contains text
2016-12-14 09:37:35 +08:00
Eloy Lafuente (stronk7)
ab73c1ddbb
Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
2016-12-13 12:00:46 +01:00
Andrew Nicols
01c7c3d8fb
Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle
2016-12-13 13:06:18 +08:00
Jun Pataleta
8aedc03754
MDL-57213 navigation: Load all my course categories into navigation tree
...
* Load all of the relevant course categories of the courses that a user
is enrolled in.
2016-12-13 11:42:11 +08:00
Eloy Lafuente (stronk7)
00759c909c
Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle
2016-12-12 16:23:14 +01:00
Dan Poltawski
394fd5f92e
Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle
2016-12-12 12:39:52 +00:00
Dan Poltawski
daab2b520f
Merge branch 'wip-mdl-57314' of https://github.com/rajeshtaneja/moodle
2016-12-12 12:21:31 +00:00
Dan Poltawski
dc81fdeb3e
Merge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github.com/ilya-catalyst/moodle
2016-12-12 09:06:38 +00:00
Nadav Kavalerchik
bb13339a2e
MDL-46714 Calendar: Properly order Date & Time fields in RTL mode
2016-12-12 12:38:04 +08:00
Dan Poltawski
1081de20e1
MDL-57319 outputlib: raise timeout for scss/less compilation
2016-12-09 08:46:27 +00:00
Ilya Tregubov
b6b38f77ba
MDL-55906 table: Update user preferences table when reset preferences
2016-12-08 15:02:04 +11: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
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
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
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
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