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
Damyon Wiese
f25185d7b0
MDL-56844 scorm: Review styles in boost theme
...
The main change is that in boost we get rid of the random centered text.
To compensate we use "container" which is fixed with with auto margins -
but the text is still left aligned.
2016-11-15 11:19:33 +08:00
Damyon Wiese
204413187e
MDL-56952 plugininfo: You can uninstall theme_base
2016-11-15 08:55:41 +08:00
Dan Poltawski
f6dabb3194
MDL-56910 filepicker: give button BS styling
2016-11-14 15:46:49 +00:00
Dan Poltawski
585ba846da
Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle
2016-11-14 13:21:35 +00:00
Dan Poltawski
55e54953a4
Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle
2016-11-14 13:09:48 +00:00
Dan Poltawski
8d857d0ecc
Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle
2016-11-14 13:06:48 +00:00
Dan Poltawski
0b96b9c5c2
Merge branch 'MDL-56618-master' of git://github.com/damyon/moodle
2016-11-14 12:38:32 +00:00
Eloy Lafuente (stronk7)
2dcb3746b0
Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle
2016-11-14 12:28:29 +01:00
Dan Poltawski
4af34676f7
MDL-56719 mod_chat: clarify 'course theme' change
...
Plus remove some pointless code.
2016-11-14 11:09:23 +00:00
Dan Poltawski
e7bba8ce4d
Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle
2016-11-14 11:06:22 +00:00
Eloy Lafuente (stronk7)
dd24216a3b
Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle
2016-11-14 12:04:25 +01:00
Dan Poltawski
ed81eab309
Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle
2016-11-14 10:49:23 +00:00
Eloy Lafuente (stronk7)
95bfa52549
Merge branch 'MDL-56882-master' of git://github.com/crazyserver/moodle
2016-11-14 11:14:37 +01:00
Dan Poltawski
ea70612b00
Merge branch 'MDL-56435-master' of git://github.com/damyon/moodle
2016-11-14 10:10:54 +00:00
Dan Poltawski
51d9431e48
Merge branch 'MDL-56931-master' of https://github.com/snake/moodle
2016-11-14 10:03:48 +00:00
Damyon Wiese
cf199b4448
MDL-56834 boost: Be cautious about nodes in the navbar
...
Some pages (fresh install) don't have the navbar yet, so check for null.
2016-11-14 17:18:29 +08:00
Pau Ferrer Ocaña
0ffe8d2f0c
MDL-56882 assign: Enable revert outcomes to No outcome
2016-11-14 09:56:35 +01:00
Dan Poltawski
d017e3fb48
Merge branch 'MDL-56398-master' of git://github.com/lameze/moodle
2016-11-14 08:34:13 +00:00
David Monllao
337b723b07
Merge branch 'MDL-56803-master' of git://github.com/damyon/moodle
2016-11-14 16:25:43 +08:00
Dan Poltawski
6b8c8f4bc2
Merge branch 'MDL-56711-master' of git://github.com/damyon/moodle
2016-11-14 08:21:14 +00:00
Damyon Wiese
f93bdccab7
MDL-56803 boost: hide region-main settings menu on 1 col layouts
2016-11-14 16:02:55 +08:00
Mark Nelson
f34df17977
MDL-56426 core_message: prevent page jump when viewing notif. settings
2016-11-14 16:02:42 +08:00
Damyon Wiese
04165cd446
MDL-56803 glossary: More style fixes for glossary
...
Fix checkbox alignment for search on small screens, and put separation
between glossary items in a list.
2016-11-14 16:02:09 +08:00
Andrew Nicols
125bd58ff9
Merge branch 'MDL-56657-master' of git://github.com/damyon/moodle
2016-11-14 15:46:31 +08:00
Damyon Wiese
1093b461f6
MDL-56803 mod_glossary: Fix styles for boost theme
2016-11-14 15:43:58 +08:00
Marina Glancy
f31e1e8b25
MDL-56899 filter: suppress dom parsing errors
...
Domdocument does not know about <video> and <audio> tags, also it's too strict for html style
solution from http://stackoverflow.com/questions/6090667/php-domdocument-errors-warnings-on-html5-tags
2016-11-14 15:16:09 +08:00
Damyon Wiese
2f3f8e45da
MDL-56657 admin: Style all admin/role pages for boost
2016-11-14 15:11:15 +08:00
Damyon Wiese
f619064b9b
MDL-56719 boost: Style mod_chat for boost
...
I stayed away from big markup changes. This is a table layout so needs rewriting which is a big job.
2016-11-14 15:08:57 +08:00
Andrew Nicols
cfade93cb8
Merge branch 'MDL-56785-master' of git://github.com/lameze/moodle
2016-11-14 15:06:40 +08:00
David Monllao
fd887df697
Merge branch 'MDL-56888-master-workshop-leap2a' of git://github.com/mudrd8mz/moodle
2016-11-14 15:01:21 +08:00