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
Dan Poltawski
b7959d831d
Merge branch 'MDL-54112-master' of https://github.com/hcpss-banderson/moodle
2016-11-01 21:31:04 +00:00
Dan Poltawski
777760b6ae
Merge branch 'master_MDL-47500' of git://github.com/danmarsden/moodle
2016-11-01 21:29:32 +00:00
Dan Poltawski
f99e7ef116
Merge branch 'mdl55456-master' of https://github.com/tlock/moodle
2016-11-01 21:26:05 +00:00
Dan Poltawski
3a24b255ba
Merge branch 'MDL-56402-master' of git://github.com/lameze/moodle
2016-11-01 21:24:57 +00: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
Eloy Lafuente (stronk7)
cad8adccc7
on-demand release 3.2dev+
2016-11-01 19:48:41 +01:00
Dan Poltawski
57911c1f40
Merge branch 'MDL-47162' of https://github.com/stronk7/moodle
2016-11-01 12:13:19 +00:00
Eloy Lafuente (stronk7)
f593e8271a
MDL-47162 badges: site & profile badges do not have courseid
...
Because of that, we need to set the, now mandatory, SITEID for
those message events to be happy. This does not affect course or
activity badges, both coming with correct courseid.
2016-11-01 12:47:54 +01: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
Dan Poltawski
0cbba93206
Merge branch 'MDL-56514-master-fix1' of https://github.com/lameze/moodle
2016-11-01 08:43:09 +00:00
Simey Lameze
67c89858aa
MDL-56402 core_message: remove tabindex attr of not selected users
2016-11-01 15:49:16 +08:00
Simey Lameze
56fa3e011a
MDL-56514 core_message: remove messaging enabled check
2016-11-01 14:15:32 +08: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
Andrew Nicols
326b285467
Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
2016-11-01 10:55:23 +08:00
Andrew Nicols
0d80a4bd0b
Merge branch 'wip-MDL-56489-master-v2' of git://github.com/abgreeve/moodle
2016-11-01 10:45:29 +08:00
Andrew Nicols
41c1314fbd
MDL-56509 tool_usertours: Fetch all role shortnames
2016-11-01 10:14:48 +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)
a1f6a27c80
Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle
2016-10-31 22:45:37 +01:00
Eloy Lafuente (stronk7)
8df0fb490b
Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle
2016-10-31 20:25:31 +01:00
Eloy Lafuente (stronk7)
2fd11f3516
Merge branch 'MDL-56188-master' of git://github.com/damyon/moodle
2016-10-31 19:59:21 +01:00
Eloy Lafuente (stronk7)
5165c9f460
MDL-56297 forms: Normalize uses of 'url' fields to use size=60
...
While this is not related to this issue, when reviewing it was
detected that the size of those url fields was really small and
looking decided to add this bit of normalization over existing uses.
2016-10-31 19:47:41 +01:00
Eloy Lafuente (stronk7)
7aa17ce256
Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle
2016-10-31 19:47:40 +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
Eric Merrill
880fc15bf0
MDL-47162 core_message: Updating all uses of messaging to add courseid
2016-10-31 14:13:13 -04: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
e90d0c90b4
MDL-56514 message: fix whitespace
2016-10-31 10:06:26 +00:00
Dan Poltawski
868f5c8709
Merge branch 'MDL-56514-master' of git://github.com/lameze/moodle
2016-10-31 10:03:59 +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
b7f3b1365d
Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle
2016-10-31 09:35:21 +00:00
Dan Poltawski
75de2e6199
Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle
2016-10-31 09:10:06 +00:00
Russell Smith
a330e83ade
MDL-56273 cache: Use is_ready() to determine if cache is really ready.
2016-10-31 19:44:05 +11: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
Simey Lameze
a2c7227ab8
MDL-56514 core_message: add missing is messaging enabled checks
2016-10-31 15:06:50 +08:00