mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
81,493 Commits 36 Branches 527 Tags
Commit Graph

4916 Commits

Author SHA1 Message Date
Andrew Nicols
3e24a75ec3 Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle 2016-11-07 10:22:25 +08:00
Damyon Wiese
1d4928003c MDL-56241 boost: Wrap block footer in a div to emulate old layout 
Some block styles are looking for .footer so we'll add it back.
 2016-11-07 09:51:39 +08:00
Dan Poltawski
fb42071776 MDL-56241 theme_boost: add example context to block.mustache 2016-11-07 09:41:05 +08:00
Damyon Wiese
f93be27185 MDL-56241 theme_boost: Add content class to blocks 
Some of the plugin styles assume .content in the selectors.
 2016-11-07 09:41:04 +08:00
David Monllao
cf4019cf40 Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle 2016-11-07 09:20:59 +08:00
David Monllao
1370e6ca52 Merge branch 'MDL-56149-master' of git://github.com/damyon/moodle 2016-11-07 07:47:27 +08:00
Damyon Wiese
207136f279 MDL-56684 competencies: Boost for competency templates 
Add BS4 markup to all competencies templates. Also tweaked the template library to make it
easier in future when modifying templates and reloading.
 2016-11-04 14:45:58 +00:00
David Monllao
629d3e5770 MDL-56576 theme_boost: Add save-settings param to admin search 2016-11-04 08:16:58 +08:00
David Monllao
18bb2883ce MDL-56677 cohort: Fix cohort search box misalignment 2016-11-03 14:33:07 +08:00
David Monllao
205577718b Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle 2016-11-03 08:22:25 +08:00
Dan Poltawski
867dc76f64 MDL-56582 boost: add some misisng template context 2016-11-02 13:55:05 +00:00
Dan Poltawski
c624351e97 Merge branch 'MDL-56582-master' of https://github.com/xow/moodle 2016-11-02 13:49:50 +00:00
Dan Poltawski
ebdd54f476 MDL-56161 boost: fix confict resolution mistake 2016-11-02 10:20:34 +00:00
Dan Poltawski
e5c726353f MDL-56161 boost: add missing example context 2016-11-02 10:14:00 +00:00
Dan Poltawski
540b01b60d Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle 2016-11-02 09:36:09 +00:00
Dan Poltawski
25b0727e50 Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle 2016-11-02 09:33:28 +00:00
Damyon Wiese
d8cfd61145 MDL-56582 theme_boost: Insert a proxy div for settings menu 
This forces text in the page to wrap around the settings cog. Also
notifications background color goes underneath the div for the
settings cog - so we give it a background color.
 2016-11-02 15:40:17 +08:00
Damyon Wiese
a5d4b54890 MDL-56698 mod_feedback: Make it look ok in boost 2016-11-02 15:25:18 +08:00
David Monllao
cf0450185e Merge branch 'wip_MDL-55913_master' of git://github.com/gjb2048/moodle 2016-11-02 12:41:48 +08:00
Andrew Nicols
6055809311 Merge branch 'MDL-56469-M32' of git://github.com/lazydaisy/moodle 2016-11-02 11:31:32 +08:00
Damyon Wiese
6ec7fb8dc1 MDL-56691 theme_boost: Fix height of nav drawer 
It should not be more than the height of the page or you can't scroll to the
last item in the list.
 2016-11-02 10:17:41 +08:00
David Monllao
2f8b51f4b7 Merge branch 'MDL-56296-master' of git://github.com/damyon/moodle 2016-11-02 09:57:45 +08:00
David Monllao
f5d9072e51 Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle 2016-11-02 09:14:09 +08:00
Damyon Wiese
9e2f13125a MDL-56161 boost: alignment static form elements 
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.

Also use a span, not a label for unlabelable static form elements.
 2016-11-02 09:06:12 +08:00
Dan Poltawski
20fd5e538c Merge branch 'MDL-56530-master' of git://github.com/andrewnicols/moodle 2016-11-01 21:21:22 +00:00
Dan Poltawski
b9703b8e05 Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle 2016-11-01 21:20:53 +00:00
Dan Poltawski
9f02188575 Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle 2016-11-01 11:35:36 +00:00
Dan Poltawski
9bf205fb73 Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle 2016-11-01 09:47:11 +00:00
Dan Poltawski
e0d5d8caed Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle 2016-11-01 09:10:08 +00:00
Damyon Wiese
757f42cb15
MDL-56587 theme_boost: Align header items 
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
 2016-11-01 11:36:08 +08:00
Adrian Greeve
839b391f74 MDL-56489 Lib: force_settings_menu added to pagelib. 
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
 2016-11-01 10:00:12 +08:00
Simey Lameze
0051b08560 MDL-56651 core_role: add styling to submit buttons 2016-11-01 09:40:53 +08:00
Eloy Lafuente (stronk7)
2fd11f3516 Merge branch 'MDL-56188-master' of git://github.com/damyon/moodle 2016-10-31 19:59:21 +01:00
Damyon Wiese
de1af8a6ed MDL-56588 theme_boost: Nice wrapping text in flat nav 
When section titles were too long they did not wrap nicely.
 2016-10-31 18:24:43 +00:00
Eloy Lafuente (stronk7)
c40a53775f Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle 2016-10-31 17:23:11 +01:00
Eloy Lafuente (stronk7)
358105b309 Merge branch 'MDL-56155-master' of git://github.com/lameze/moodle 2016-10-31 17:11:21 +01:00
Dan Poltawski
9e972b3da4 Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle 2016-10-31 15:54:22 +00:00
Dan Poltawski
a9f119efd6 Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle 2016-10-31 15:36:21 +00:00
Dan Poltawski
6795b0a0c7 Merge branch 'MDL-56580-master' of git://github.com/junpataleta/moodle 2016-10-31 15:20:45 +00:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Dan Poltawski
5ad34c43f6 Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle 2016-10-31 15:10:02 +00:00
Dan Poltawski
0e86392133 Merge branch 'MDL-56578-master' of git://github.com/damyon/moodle 2016-10-31 15:04:55 +00:00
Damyon Wiese
155b0bc0b9 MDL-56578 theme_boost: Dismiss help popovers on next click 2016-10-31 22:01:19 +08:00
Damyon Wiese
2259c0f078 MDL-56621 templates: Add missing example contexts 2016-10-31 21:27:52 +08:00
Dan Poltawski
b0f7a97c42 Merge branch 'MDL-56610-master' of git://github.com/damyon/moodle 2016-10-31 10:20:08 +00:00
Dan Poltawski
f7614c6007 Merge branch 'MDL-56523-master' of git://github.com/lazydaisy/moodle 2016-10-31 10:19:13 +00:00
Dan Poltawski
703863ce82 Merge branch 'MDL-56599-master' of git://github.com/damyon/moodle 2016-10-31 09:57:03 +00:00
Dan Poltawski
75de2e6199 Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle 2016-10-31 09:10:06 +00:00
Damyon Wiese
a2d9a89f5a MDL-56149 permissions: Alignment of icons should not wrap 
/admin/roles/permissions.php?contextid=2 the icons should not wrap.
 2016-10-31 16:24:11 +08:00
Damyon Wiese
6fb8a7ab7e MDL-56621 forms: Hide format menu if only one 
This was a regression in the new templates for editors.
 2016-10-31 15:06:50 +08:00