82078 Commits

Author SHA1 Message Date
Andrew Nicols
901c0ea7de Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle 2016-11-16 10:08:13 +08:00
David Monllao
8898725385 Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle 2016-11-16 10:04:37 +08:00
Damyon Wiese
cee482ca4e MDL-56703 boost: Fix mustache html warnings
Don't put div in a span
2016-11-16 10:01:19 +08:00
Damyon Wiese
7a9309f32e MDL-56703 boost: Escaping bug in flat nav and navbar
The items in the flat navigation were double escaped. Also added
context to template.
2016-11-16 10:01:11 +08:00
Andrew Nicols
4642a8c593 Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle 2016-11-16 09:52:55 +08:00
Damyon Wiese
4682f17c49 MDL-56967 boost: Fix for layout problem with IE11 2016-11-16 09:36:38 +08:00
Mathew May
44002b183c MDL-55362 core: Fixed topic section default name empty h2 tag 2016-11-16 14:19:55 +13:00
Rajesh Taneja
4b371f9769
MDL-56710 editor: Fix box-sizing to context box
With BS4, box-sizing is border-box and this leads to
icon not shown properly. TinyMCE toolbar should use
box-sizing as context-box
2016-11-16 08:37:15 +08:00
David Monllao
e466786f78 Merge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle 2016-11-16 08:33:45 +08:00
Andrew Nicols
6aefea74a4 Merge branch 'MDL-55209' of https://github.com/NeillM/moodle 2016-11-16 08:24:39 +08:00
Rajesh Taneja
4ea8f814a0
MDL-56981 behat: Fixed xpath of radio button to contain class 2016-11-16 08:14:07 +08:00
David Monllao
1c70e86b5e Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle 2016-11-16 08:09:54 +08:00
David Monllao
900a2c554e Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle 2016-11-16 05:31:55 +08:00
Matteo Scaramuccia
ade30c673c MDL-56917 core_upgrade: Do not use the raw version to check cURL caps.
Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, https://github.com/remicollet/remirepo/commit/87954ef9ca41
2016-11-15 21:50:07 +01:00
Mike Churchward
930570b410 MDL-48055 q_u_outline, q_u_complete: added checks for grade visibility. 2016-11-15 12:35:38 -05:00
Dan Poltawski
6027eaebc5 Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle 2016-11-15 16:33:26 +00:00
Dan Poltawski
78b281b24d Merge branch 'wip-mdl-56860' of git://github.com/rajeshtaneja/moodle 2016-11-15 16:29:59 +00:00
Dan Poltawski
1efacd2b35 MDL-56767 block_login: add bootstrap markup
Remove existing overrides forcing the markup off
2016-11-15 15:44:09 +00:00
Dan Poltawski
e44bd69aaa MDL-56939 theme_boost: Link to MDL for future 2016-11-15 14:31:45 +00:00
Dan Poltawski
dad0b3bfeb Merge branch 'MDL-56939-master' of git://github.com/damyon/moodle 2016-11-15 14:29:35 +00:00
gabrielrosset
d030347bce MDL-33960 mod_lti: fix page scroll 2016-11-15 14:40:21 +01:00
Dan Poltawski
d25f96b766 MDL-56908 upgrade: bootstrap styling for settings save button 2016-11-15 12:51:14 +00:00
Dan Poltawski
b4d6669dd0 on-demand release 3.2beta+ 2016-11-15 11:02:52 +00:00
Dan Poltawski
90d00d0eae Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-11-15 11:02:51 +00:00
Dan Poltawski
efe57105d6 Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-15 10:42:36 +00:00
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00
Ankit Agarwal
0d02bb964b MDL-56965 themes: Fix logo CSS for RTL 2016-11-15 15:20:36 +05:30
Jake Dallimore
5cfaecac47 MDL-56931 themes: restrict extra padding to edit mode only 2016-11-15 09:29:57 +00:00
David Monllao
396edc0a5e Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:42 +00:00
Damyon Wiese
998432c2c9 MDL-56724 mod_choice: Improve alignment and checkboxes on dates 2016-11-15 09:07:42 +00:00
David Monllao
2f3ae73ab0 Merge branch 'wip-MDL-56899-master' of git://github.com/marinaglancy/moodle 2016-11-15 09:07:41 +00:00
David Monllao
04fbba050d Merge branch 'MDL-56690-master' of git://github.com/damyon/moodle 2016-11-15 09:07:40 +00:00
Andrew Nicols
1e9f38a487 Merge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle 2016-11-15 09:07:40 +00:00
Damyon Wiese
813afc6797 MDL-56618 behat: Fix xpath for behat
We changed the output so the test needs to match
2016-11-15 09:07:39 +00:00
Simey Lameze
c1584e154c MDL-56785 theme_boost: apply bs4 styles to search options checkboxes 2016-11-15 09:07:39 +00:00
Andrew Nicols
ebba556af7 Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle 2016-11-15 09:07:38 +00:00
Andrew Nicols
7afc76fbd6 Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle 2016-11-15 09:07:37 +00:00
David Monllao
92ba7648fe Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:37 +00:00
Andrew Nicols
2d45ac279d Merge branch 'MDL-56823' of git://github.com/aolley/moodle 2016-11-15 09:07:36 +00:00
David Monllao
1cc10f3f67 Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:35 +00:00
David Monllao
0fef835188 Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle 2016-11-15 09:07:35 +00:00
Eloy Lafuente (stronk7)
7a677348e4 Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle 2016-11-15 09:07:34 +00:00
Eloy Lafuente (stronk7)
2589802489 Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:33 +00:00
David Monllao
5a9a2c61b9 Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle 2016-11-15 09:07:33 +00:00
David Monllao
39e7d46d89 Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle 2016-11-15 09:07:32 +00:00
Andrew Nicols
2fd423721f Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle 2016-11-15 09:07:31 +00:00
Dan Poltawski
4f1ba09334 Merge branch 'MDL-54871' of https://github.com/bostelm/moodle 2016-11-15 09:07:31 +00:00
Dan Poltawski
642bbbdd10 Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle 2016-11-15 09:07:30 +00:00
Dan Poltawski
4678592332 Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle 2016-11-15 09:07:29 +00:00
Dan Poltawski
6dad38deed Merge branch 'MDL-56913' of git://github.com/timhunt/moodle 2016-11-15 09:07:29 +00:00