David Monllao [Thu, 17 Nov 2016 12:25:31 +0000 (20:25 +0800)]
Merge branch 'MDL-56826-master-fix1' of git://github.com/damyon/moodle
David Monllao [Thu, 17 Nov 2016 12:23:20 +0000 (20:23 +0800)]
Merge branch 'MDL-57015' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 17 Nov 2016 11:32:49 +0000 (11:32 +0000)]
Merge branch 'wip-MDL-56869-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 17 Nov 2016 10:15:51 +0000 (10:15 +0000)]
Merge branch 'MDL-56467_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 17 Nov 2016 08:51:18 +0000 (08:51 +0000)]
Merge branch 'MDL-56767-master-fix' of https://github.com/lameze/moodle
Damyon Wiese [Thu, 17 Nov 2016 07:51:48 +0000 (15:51 +0800)]
MDL-56826 question: Add bootstrap styles to question preview
David Monllao [Thu, 17 Nov 2016 08:10:01 +0000 (16:10 +0800)]
Merge branch 'MDL-56763-master' of git://github.com/lameze/moodle
David Monllao [Thu, 17 Nov 2016 07:10:52 +0000 (15:10 +0800)]
Merge branch 'MDL-56734-master' of git://github.com/lameze/moodle
Andrew Nicols [Thu, 17 Nov 2016 06:36:02 +0000 (14:36 +0800)]
Merge branch 'wip-MDL-57007-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Thu, 17 Nov 2016 06:33:39 +0000 (14:33 +0800)]
Merge branch 'MDL-56822-master' of git://github.com/cameron1729/moodle
David Monllao [Thu, 17 Nov 2016 06:25:52 +0000 (14:25 +0800)]
MDL-56826 version: Increase version after history rewrite
David Monllao [Thu, 17 Nov 2016 06:24:59 +0000 (14:24 +0800)]
Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 8 Nov 2016 07:14:02 +0000 (15:14 +0800)]
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.
Simey Lameze [Thu, 17 Nov 2016 02:04:48 +0000 (10:04 +0800)]
MDL-56763 theme_boost: ignore boostrap popover rtl scss
Because Bootstrap Javascript does is not expecting to be flipped, it breaks the popover on RTL languages.
We already swap the directions on the help icon template so popover scss rules can be ignored.
Simey Lameze [Thu, 17 Nov 2016 04:12:34 +0000 (12:12 +0800)]
MDL-56767 theme_boost: change remember username checkbox to bs4 style
Andrew Nicols [Thu, 17 Nov 2016 05:31:33 +0000 (13:31 +0800)]
Merge branch 'MDL-56221' of https://github.com/bostelm/moodle
David Monllao [Thu, 17 Nov 2016 05:27:21 +0000 (13:27 +0800)]
Merge branch 'MDL-56463_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 17 Nov 2016 05:25:50 +0000 (13:25 +0800)]
MDL-56763 tool_mobile: Unit test fix
Checking external_format_text return instead of just using SITE->summary
Simey Lameze [Fri, 4 Nov 2016 01:59:54 +0000 (09:59 +0800)]
MDL-56734 tool_lp: add competency frameworks repo button
David Monllao [Thu, 17 Nov 2016 05:10:23 +0000 (13:10 +0800)]
Merge branch 'MDL-56463-master' of git://github.com/jleyva/moodle
Marina Glancy [Thu, 17 Nov 2016 05:07:09 +0000 (13:07 +0800)]
MDL-57007 behat: assume all capabilities during installation
David Monllao [Thu, 17 Nov 2016 04:28:34 +0000 (12:28 +0800)]
Merge branch 'MDL-56842-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 17 Nov 2016 04:18:26 +0000 (12:18 +0800)]
Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle
Cameron Ball [Fri, 11 Nov 2016 09:18:12 +0000 (17:18 +0800)]
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.
Andrew Nicols [Thu, 17 Nov 2016 03:20:39 +0000 (11:20 +0800)]
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
Jake Dallimore [Fri, 11 Nov 2016 09:18:07 +0000 (17:18 +0800)]
MDL-56870 lib: block access to deleted module in require_login
David Monllao [Thu, 17 Nov 2016 02:42:08 +0000 (10:42 +0800)]
Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 16 Nov 2016 01:47:03 +0000 (09:47 +0800)]
MDL-52186 enrol_meta: Sync only active enrol_meta instances
Thanks to Peter Klinka for the solution!
David Monllao [Thu, 17 Nov 2016 02:35:38 +0000 (10:35 +0800)]
Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 17 Nov 2016 02:32:00 +0000 (10:32 +0800)]
Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 17 Nov 2016 02:07:35 +0000 (10:07 +0800)]
Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2016 01:13:02 +0000 (02:13 +0100)]
MDL-57015 tests: Use preventResetByRollback() if test uses transactions
David Monllao [Thu, 17 Nov 2016 01:31:07 +0000 (09:31 +0800)]
Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle
Rajesh Taneja [Thu, 17 Nov 2016 00:56:54 +0000 (08:56 +0800)]
MDL-56865 behat: Don't set error handler for behat install
Andrew Nicols [Thu, 17 Nov 2016 00:51:47 +0000 (08:51 +0800)]
Merge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 17 Nov 2016 00:46:32 +0000 (08:46 +0800)]
MDL-56603 behat: Fixed search messages string to use id
Eloy Lafuente (stronk7) [Thu, 17 Nov 2016 00:38:24 +0000 (01:38 +0100)]
Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle
Henning Bostelmann [Sun, 6 Nov 2016 23:16:19 +0000 (23:16 +0000)]
MDL-56221 mod_assign: Suppress unwanted grade notifications
* Quick grading: Properly recognize unchanged grades
* Individual grading: Amend JS that transfers checkbox state
Mark Nielsen [Wed, 16 Nov 2016 16:59:15 +0000 (08:59 -0800)]
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.
Juan Leyva [Tue, 1 Nov 2016 21:12:14 +0000 (21:12 +0000)]
MDL-56463 tool_mobile: Apply text formatting to tool_mobile WS
Dan Poltawski [Wed, 16 Nov 2016 13:50:18 +0000 (13:50 +0000)]
MDL-56842 boost: add example context to login template
Dan Poltawski [Wed, 16 Nov 2016 13:49:43 +0000 (13:49 +0000)]
MDL-56842 boost: load required js on login page
Dan Poltawski [Wed, 16 Nov 2016 13:03:38 +0000 (13:03 +0000)]
Merge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle
Dan Poltawski [Tue, 15 Nov 2016 12:31:37 +0000 (12:31 +0000)]
MDL-56922 theme_boost: grey out activity icon when hidden
This was present in bootstrapbase and is I think an important visual
distinction.
David Monllao [Wed, 16 Nov 2016 11:38:08 +0000 (19:38 +0800)]
Merge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 10:29:01 +0000 (11:29 +0100)]
Merge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle
Frederic Massart [Wed, 16 Nov 2016 05:29:56 +0000 (13:29 +0800)]
MDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 10:18:15 +0000 (11:18 +0100)]
Merge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 16 Nov 2016 10:08:10 +0000 (10:08 +0000)]
Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 16 Nov 2016 09:46:10 +0000 (09:46 +0000)]
Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)]
Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 16 Nov 2016 09:20:28 +0000 (09:20 +0000)]
Merge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle
Frederic Massart [Wed, 16 Nov 2016 09:19:19 +0000 (17:19 +0800)]
MDL-56915 webdav: Increase maximum expected header size
Dan Poltawski [Wed, 16 Nov 2016 08:48:59 +0000 (08:48 +0000)]
MDL-56889 boostrapbase: remove excessive stylelint-disables
From bs4-compat.less, replace with file level disable instead.
Simey Lameze [Wed, 16 Nov 2016 05:30:39 +0000 (13:30 +0800)]
MDL-56889 bootstrapbase: create static bs4 compatible mixins
Marina Glancy [Thu, 10 Nov 2016 03:47:27 +0000 (11:47 +0800)]
MDL-56869 media_videojs: upgrade video.js to 5.12.6
Dan Poltawski [Wed, 16 Nov 2016 08:09:14 +0000 (08:09 +0000)]
MDL-56767 block_login: Use btn-block as suggested by Andrew
Marina Glancy [Wed, 16 Nov 2016 07:46:56 +0000 (15:46 +0800)]
MDL-56776 calendar: display month above the dates
month is displayed in table caption which is by default in the bottom in BS4
Andrew Nicols [Wed, 16 Nov 2016 07:36:37 +0000 (15:36 +0800)]
Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 16 Nov 2016 07:18:27 +0000 (15:18 +0800)]
MDL-56999 boost: Maintenance layout needs padding
Mark Nelson [Wed, 16 Nov 2016 06:34:37 +0000 (14:34 +0800)]
MDL-56467 message_airnotifier: fixed settings pop-up not displaying
Adrian Greeve [Thu, 10 Nov 2016 04:24:50 +0000 (12:24 +0800)]
MDL-56603 message: Added see all link to message popup.
Adrian Greeve [Wed, 16 Nov 2016 06:45:26 +0000 (14:45 +0800)]
MDL-56603 messaging: Add a new message link to popup.
Added a link to create a new message from the message
popup menu.
Andrew Nicols [Wed, 16 Nov 2016 06:14:26 +0000 (14:14 +0800)]
Merge branch 'wip-mdl-56710' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 16 Nov 2016 06:05:07 +0000 (14:05 +0800)]
Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 16 Nov 2016 06:00:40 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-56981' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 16 Nov 2016 05:49:51 +0000 (13:49 +0800)]
Merge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle
David Monllao [Wed, 16 Nov 2016 05:35:38 +0000 (13:35 +0800)]
Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle
Cameron Ball [Wed, 16 Nov 2016 01:47:13 +0000 (09:47 +0800)]
MDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect
The markup in the filemanager_fileselect template was being escaped,
causing a help icon not to display.
Additionally, the popover for the help icon was not display since
"loader.js" was not properly delegating the popover calls.
David Monllao [Wed, 16 Nov 2016 03:51:18 +0000 (11:51 +0800)]
Merge branch 'MDL-56139_master' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 16 Nov 2016 03:07:20 +0000 (11:07 +0800)]
Merge branch 'MDL-56958-master' of git://github.com/damyon/moodle
Mark Nelson [Tue, 15 Nov 2016 06:28:15 +0000 (14:28 +0800)]
MDL-56139 core_message: removed unused constants
Mark Nelson [Thu, 10 Nov 2016 04:47:20 +0000 (12:47 +0800)]
MDL-56139 core: changes after peer review
- No longer use the Fibonacci sequence for delaying the timeout.
It is too aggressive.
- The backoff_timer AMD module now expects the callback AND the
backoff function to be passed to the constructor.
- Added ability to specify polling frequency in config.php.
- Added helper function to return the cache key.
- Reworded the parameters for clarity.
Ryan Wyllie [Thu, 20 Oct 2016 06:01:57 +0000 (06:01 +0000)]
MDL-56139 message: ajax poll for new messages in message area
Andrew Nicols [Wed, 16 Nov 2016 02:16:09 +0000 (10:16 +0800)]
Merge branch 'MDL-56703-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 16 Nov 2016 02:08:13 +0000 (10:08 +0800)]
Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle
David Monllao [Wed, 16 Nov 2016 02:04:37 +0000 (10:04 +0800)]
Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle
Damyon Wiese [Tue, 15 Nov 2016 03:01:23 +0000 (11:01 +0800)]
MDL-56703 boost: Fix mustache html warnings
Don't put div in a span
Damyon Wiese [Mon, 14 Nov 2016 05:30:49 +0000 (13:30 +0800)]
MDL-56703 boost: Escaping bug in flat nav and navbar
The items in the flat navigation were double escaped. Also added
context to template.
Andrew Nicols [Wed, 16 Nov 2016 01:52:55 +0000 (09:52 +0800)]
Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 15 Nov 2016 07:02:40 +0000 (15:02 +0800)]
MDL-56967 boost: Fix for layout problem with IE11
Mathew May [Fri, 4 Nov 2016 01:18:21 +0000 (14:18 +1300)]
MDL-55362 core: Fixed topic section default name empty h2 tag
Rajesh Taneja [Wed, 16 Nov 2016 00:37:15 +0000 (08:37 +0800)]
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
David Monllao [Wed, 16 Nov 2016 00:33:45 +0000 (08:33 +0800)]
Merge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle
Andrew Nicols [Wed, 16 Nov 2016 00:24:39 +0000 (08:24 +0800)]
Merge branch 'MDL-55209' of https://github.com/NeillM/moodle
Rajesh Taneja [Wed, 16 Nov 2016 00:14:07 +0000 (08:14 +0800)]
MDL-56981 behat: Fixed xpath of radio button to contain class
David Monllao [Wed, 16 Nov 2016 00:09:54 +0000 (08:09 +0800)]
Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 15 Nov 2016 21:31:55 +0000 (05:31 +0800)]
Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle
Matteo Scaramuccia [Sat, 12 Nov 2016 22:35:40 +0000 (23:35 +0100)]
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
Mike Churchward [Tue, 15 Nov 2016 17:35:38 +0000 (12:35 -0500)]
MDL-48055 q_u_outline, q_u_complete: added checks for grade visibility.
Dan Poltawski [Tue, 15 Nov 2016 16:33:26 +0000 (16:33 +0000)]
Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 15 Nov 2016 16:29:59 +0000 (16:29 +0000)]
Merge branch 'wip-mdl-56860' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 15 Nov 2016 15:22:58 +0000 (15:22 +0000)]
MDL-56767 block_login: add bootstrap markup
Remove existing overrides forcing the markup off
Dan Poltawski [Tue, 15 Nov 2016 14:31:45 +0000 (14:31 +0000)]
MDL-56939 theme_boost: Link to MDL for future
Dan Poltawski [Tue, 15 Nov 2016 14:29:35 +0000 (14:29 +0000)]
Merge branch 'MDL-56939-master' of git://github.com/damyon/moodle
gabrielrosset [Tue, 15 Nov 2016 13:40:21 +0000 (14:40 +0100)]
MDL-33960 mod_lti: fix page scroll
Dan Poltawski [Tue, 15 Nov 2016 12:49:51 +0000 (12:49 +0000)]
MDL-56908 upgrade: bootstrap styling for settings save button
Dan Poltawski [Tue, 15 Nov 2016 11:02:52 +0000 (11:02 +0000)]
on-demand release 3.2beta+
Dan Poltawski [Tue, 15 Nov 2016 11:02:51 +0000 (11:02 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 15 Nov 2016 10:42:36 +0000 (10:42 +0000)]
Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle