Andrew Nicols
79f15159da
Merge branch 'wip-MDL-57007-master' of git://github.com/marinaglancy/moodle
2016-11-17 14:36:02 +08:00
Andrew Nicols
2f0cd733be
Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle
2016-11-17 14:33:39 +08:00
David Monllao
4006e187f3
MDL-56826 version: Increase version after history rewrite
2016-11-17 14:25:52 +08:00
David Monllao
98f43f1b08
Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle
2016-11-17 14:24:59 +08:00
Damyon Wiese
12d6dfc1ce
MDL-56826 questions: Add styling for boost theme
...
Changes include:
* question: Add bootstrap classes to buttons and selects so they look consistent.
* mod_quiz: Add bootstrap styles to report form elements
* question: Add bootstrap classes to question form elements
* And remove the success/fail styles from boost because they conflict badly
with the quiz plugin styles (making unreadable text).
* quiz: nav block buttons had black background
* quiz: Add bootstrap styles to quiz navigation buttons
* qtype_ddmarker: Remove bullets from list
Edit form coordinates preview had list bullets for each coordinate.
* boost: Prevent menu scrolling on quiz edit
* mod_quiz: Add bootstrap styles to edit quiz fields
Pagination and max grades forms.
* quiz: Undo some custom styles on review options
These checkboxes were laid out in a fake grid with no responsiveness
that conflicts with the bootstrap form-inline templates. Reset the
custom style to bootstrap default.
* quiz: Fix unit tests for boost changes
* qtype_ddwtos: Accurate positioning of drop targets
* questions: Make the review page responsive
* question: bootstrap 4 compatibility
.alert in bs4 contains no colours by default, you need to mix it with
one of the context classes to get some change in colours, borders etc.
2016-11-17 14:20:52 +08:00
Andrew Nicols
3d15dfc9d2
Merge branch 'MDL-56221' of https://github.com/bostelm/moodle
2016-11-17 13:31:33 +08:00
David Monllao
c35ef2e9a0
Merge branch 'MDL-56463_master-fix' of git://github.com/dmonllao/moodle
2016-11-17 13:27:21 +08:00
David Monllao
96abc5f1cd
MDL-56763 tool_mobile: Unit test fix
...
Checking external_format_text return instead of just using SITE->summary
2016-11-17 13:25:54 +08:00
David Monllao
d41b1ba49e
Merge branch 'MDL-56463-master' of git://github.com/jleyva/moodle
2016-11-17 13:10:23 +08:00
Marina Glancy
e938ea398c
MDL-57007 behat: assume all capabilities during installation
2016-11-17 13:07:09 +08:00
David Monllao
29dfbb422f
Merge branch 'MDL-56842-master' of git://github.com/danpoltawski/moodle
2016-11-17 12:28:34 +08:00
David Monllao
9ecf0674ff
Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle
2016-11-17 12:18:26 +08:00
Cameron Ball
b5b7af96bb
MDL-56822 messaging: Hide notification icons on site policy screen
...
If we have the nofications and messaging popovers displaying on the
policy confirmation screen we hit an exception since the webservices
won't work if the policy hasn't been agreed to.
This patch simply stops them from showing if the site policy hasn't
been agreed to.
2016-11-17 12:10:52 +08:00
Andrew Nicols
76acac80eb
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
2016-11-17 11:20:39 +08:00
Jake Dallimore
a428cf4ac8
MDL-56870 lib: block access to deleted module in require_login
2016-11-17 10:57:13 +08:00
David Monllao
0915860e51
Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle
2016-11-17 10:42:08 +08:00
Jun Pataleta
b62bebbf1c
MDL-52186 enrol_meta: Sync only active enrol_meta instances
...
Thanks to Peter Klinka for the solution!
2016-11-17 10:40:54 +08:00
David Monllao
75166d0627
Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle
2016-11-17 10:35:38 +08:00
David Monllao
6dc3a5b699
Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle
2016-11-17 10:32:00 +08:00
Andrew Nicols
50e16a67ab
Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle
2016-11-17 10:07:35 +08:00
David Monllao
a813b0c3dc
Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle
2016-11-17 09:31:07 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install
2016-11-17 08:56:54 +08:00
Andrew Nicols
84c8c00959
Merge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle
2016-11-17 08:51:47 +08:00
Rajesh Taneja
d48c0a1d9a
MDL-56603 behat: Fixed search messages string to use id
2016-11-17 08:46:32 +08:00
Eloy Lafuente (stronk7)
7b0057b895
Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle
2016-11-17 01:38:24 +01:00
Henning Bostelmann
9574320a36
MDL-56221 mod_assign: Suppress unwanted grade notifications
...
* Quick grading: Properly recognize unchanged grades
* Individual grading: Amend JS that transfers checkbox state
2016-11-16 21:53:33 +00:00
Mark Nielsen
6670d28fbc
MDL-56978 core: fix error handling in min_fix_utf8
...
Must completely suppress notice from iconv as Behat's
shutdown function uses error_get_last() which is
unable to detect if the error was suppressed or not.
2016-11-16 08:59:15 -08:00
Juan Leyva
e2fe3bc081
MDL-56463 tool_mobile: Apply text formatting to tool_mobile WS
2016-11-16 14:54:37 +00:00
Dan Poltawski
6182ec8901
MDL-56842 boost: add example context to login template
2016-11-16 13:59:47 +00:00
Dan Poltawski
16732d0631
MDL-56842 boost: load required js on login page
2016-11-16 13:59:47 +00:00
Dan Poltawski
7d3a7bbd1f
Merge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle
2016-11-16 13:03:38 +00:00
Dan Poltawski
3b195bfb81
MDL-56922 theme_boost: grey out activity icon when hidden
...
This was present in bootstrapbase and is I think an important visual
distinction.
2016-11-16 11:58:42 +00:00
David Monllao
e3cb80f10c
Merge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle
2016-11-16 19:38:08 +08:00
Eloy Lafuente (stronk7)
904fcbee8b
Merge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle
2016-11-16 11:29:01 +01:00
Frederic Massart
6321934c73
MDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns
2016-11-16 10:20:53 +00:00
Eloy Lafuente (stronk7)
751122dbc0
Merge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle
2016-11-16 11:18:15 +01:00
Dan Poltawski
c1e74a0937
Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle
2016-11-16 10:08:10 +00:00
Dan Poltawski
f882aed3b3
Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle
2016-11-16 09:46:10 +00:00
Eloy Lafuente (stronk7)
e7b9ea226c
Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
2016-11-16 10:33:09 +01:00
Dan Poltawski
1bf9d6ac92
Merge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle
2016-11-16 09:20:28 +00:00
Frederic Massart
35b48c7aed
MDL-56915 webdav: Increase maximum expected header size
2016-11-16 17:19:19 +08:00
Dan Poltawski
706e012fd6
MDL-56889 boostrapbase: remove excessive stylelint-disables
...
From bs4-compat.less, replace with file level disable instead.
2016-11-16 08:50:14 +00:00
Simey Lameze
660b51e013
MDL-56889 bootstrapbase: create static bs4 compatible mixins
2016-11-16 08:50:08 +00:00
Dan Poltawski
6dc4c68e4e
MDL-56767 block_login: Use btn-block as suggested by Andrew
2016-11-16 08:09:14 +00:00
Marina Glancy
4125ce046b
MDL-56776 calendar: display month above the dates
...
month is displayed in table caption which is by default in the bottom in BS4
2016-11-16 15:46:56 +08:00
Andrew Nicols
7da7c1e24a
Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle
2016-11-16 15:36:37 +08:00
Damyon Wiese
3eb9cc2f6e
MDL-56999 boost: Maintenance layout needs padding
2016-11-16 15:18:27 +08:00
Adrian Greeve
d3d0248afc
MDL-56603 message: Added see all link to message popup.
2016-11-16 14:51:17 +08:00
Adrian Greeve
8151761378
MDL-56603 messaging: Add a new message link to popup.
...
Added a link to create a new message from the message
popup menu.
2016-11-16 14:51:17 +08:00
Andrew Nicols
faadaedb17
Merge branch 'wip-mdl-56710' of https://github.com/rajeshtaneja/moodle
2016-11-16 14:14:26 +08:00
