Dan Poltawski [Wed, 30 Nov 2016 09:52:35 +0000 (09:52 +0000)]
Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood/moodle
Dan Poltawski [Wed, 30 Nov 2016 09:51:21 +0000 (09:51 +0000)]
Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle
Cameron Ball [Wed, 30 Nov 2016 09:45:41 +0000 (17:45 +0800)]
MDL-57207 mod_lti: Remove redundant popover() call
Since MDL-56748 popovers are properly delegated. Making manual calls
to .popover redundant.
Andrew Nicols [Wed, 30 Nov 2016 07:03:43 +0000 (15:03 +0800)]
Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 30 Nov 2016 06:27:23 +0000 (14:27 +0800)]
Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle
David Monllao [Wed, 30 Nov 2016 05:56:08 +0000 (13:56 +0800)]
Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle
David Monllao [Wed, 30 Nov 2016 05:36:32 +0000 (13:36 +0800)]
Merge branch 'MDL-57072-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 30 Nov 2016 05:15:58 +0000 (13:15 +0800)]
Merge branch 'MDL-57177-master' of git://github.com/cameron1729/moodle
Frederic Massart [Wed, 30 Nov 2016 04:19:03 +0000 (12:19 +0800)]
MDL-57127 output: Increase memory limit when parsing CSS
Andrew Nicols [Wed, 30 Nov 2016 04:09:29 +0000 (12:09 +0800)]
Merge branch 'MDL-57101-master-2nd' of git://github.com/FMCorz/moodle
David Monllao [Wed, 30 Nov 2016 03:34:29 +0000 (11:34 +0800)]
Merge branch 'MDL-56955-master' of git://github.com/lameze/moodle
Simey Lameze [Mon, 28 Nov 2016 04:53:55 +0000 (12:53 +0800)]
MDL-56955 theme_boost: fix login failure displaying on user menu
David Monllao [Wed, 30 Nov 2016 02:43:16 +0000 (10:43 +0800)]
Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 30 Nov 2016 02:38:51 +0000 (10:38 +0800)]
MDL-57205 forms: Prevent debugging in selectgroups
Sometimes the option group has no options I guess. The same check is in
exportValue.
Andrew Nicols [Wed, 30 Nov 2016 02:20:31 +0000 (10:20 +0800)]
Merge branch 'wip-MDL-57186-master' of https://github.com/marinaglancy/moodle
David Monllao [Wed, 30 Nov 2016 02:05:16 +0000 (10:05 +0800)]
Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle
David Monllao [Wed, 30 Nov 2016 01:26:07 +0000 (09:26 +0800)]
Merge branch 'MDL-57095-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 30 Nov 2016 01:12:54 +0000 (09:12 +0800)]
Merge branch 'MDL-57174_master' of git://github.com/markn86/moodle
Jun Pataleta [Tue, 29 Nov 2016 02:05:14 +0000 (10:05 +0800)]
MDL-57072 theme_boost: Render action menu for category management
Eloy Lafuente (stronk7) [Tue, 29 Nov 2016 21:58:22 +0000 (22:58 +0100)]
MDL-57197 versions: main version bump
Eloy Lafuente (stronk7) [Tue, 29 Nov 2016 21:57:05 +0000 (22:57 +0100)]
MDL-57197 versions: bump all versions and requires near release
version =
2016120500 release version
requires=
2016112900 current rc4 version
Eloy Lafuente (stronk7) [Tue, 29 Nov 2016 21:36:29 +0000 (22:36 +0100)]
Merge branch 'MDL-57133-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 29 Nov 2016 13:33:15 +0000 (13:33 +0000)]
Moodle release 3.2rc4
Dan Poltawski [Tue, 29 Nov 2016 13:33:13 +0000 (13:33 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Mudrák [Tue, 29 Nov 2016 11:24:49 +0000 (12:24 +0100)]
MDL-56800 theme_boost: Radios should not have name if soft frozen, too
Andrew Nicols [Tue, 29 Nov 2016 05:47:15 +0000 (13:47 +0800)]
MDL-56800 theme_boost: Remove name from hardFrozen radio
Ryan Wyllie [Tue, 29 Nov 2016 07:14:05 +0000 (07:14 +0000)]
MDL-57095 theme: fix content styling for notification page
Marina Glancy [Tue, 29 Nov 2016 05:54:49 +0000 (13:54 +0800)]
MDL-57186 media: fix link in security report
Andrew Nicols [Tue, 29 Nov 2016 05:48:55 +0000 (13:48 +0800)]
MDL-56858 theme_boost: Correct bad merge conflict
David Monllao [Tue, 29 Nov 2016 05:41:55 +0000 (13:41 +0800)]
Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 29 Nov 2016 05:36:52 +0000 (13:36 +0800)]
Merge branch 'MDL-57158-int-fix-1' of github.com:ryanwyllie/moodle
Damyon Wiese [Tue, 29 Nov 2016 05:21:35 +0000 (13:21 +0800)]
MDL-57124 boost: I want really tiny logos.
Said no-one ever.
Use max-height so very small logos will not be scaled up.
Marina Glancy [Tue, 29 Nov 2016 05:02:31 +0000 (13:02 +0800)]
MDL-56829 media_videojs: play inline on iPhone with ios 10
Frederic Massart [Tue, 29 Nov 2016 03:40:10 +0000 (11:40 +0800)]
MDL-57101 filter: Always set-up the page for filters
Frederic Massart [Wed, 23 Nov 2016 08:17:15 +0000 (16:17 +0800)]
MDL-57101 media_videojs: Set-up player on dynamically loaded content
Andrew Nicols [Tue, 29 Nov 2016 04:06:56 +0000 (12:06 +0800)]
Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 25 Nov 2016 06:52:46 +0000 (14:52 +0800)]
MDL-56919 mod_forum: Assign check icon for selected subscription mode
Andrew Nicols [Tue, 29 Nov 2016 03:52:32 +0000 (11:52 +0800)]
Merge branch 'MDL-56858_master-alt-2' of git://github.com/markn86/moodle
David Monllao [Tue, 29 Nov 2016 03:46:55 +0000 (11:46 +0800)]
Merge branch 'MDL-57163_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 28 Nov 2016 05:25:02 +0000 (13:25 +0800)]
MDL-57163 install: Check curl availability before curl_version()
Rajesh Taneja [Tue, 29 Nov 2016 02:53:02 +0000 (10:53 +0800)]
MDL-57168 behat: Don't press continue as it will go to Annotate PDF
This might cause random failures as the draft files are being accessed by other user
David Monllao [Tue, 29 Nov 2016 02:51:10 +0000 (10:51 +0800)]
Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle
Cameron Ball [Mon, 28 Nov 2016 07:23:02 +0000 (15:23 +0800)]
MDL-57177 theme_boost: Use regular ! for advanced form fields
Previously we used U+2757 on advanced form fields, which was problematic
as it's part of emoji and displays differently on different platforms.
This is a problem since we explicitly style it to be blue, but, for
example on OS X it's red (since it gets replaced with their emoji).
Mark Nelson [Tue, 29 Nov 2016 02:24:55 +0000 (10:24 +0800)]
MDL-57174 mod_lesson: show settings menu on edit.php page
Damyon Wiese [Tue, 29 Nov 2016 02:07:16 +0000 (10:07 +0800)]
MDL-57124 boost: Show pageheaderbutton when no navbar
Even if there is no navbar - if there is a pageheaderbutton we need to
show it (E.g. Customise this page on dashboard).
David Mudrák [Tue, 29 Nov 2016 00:59:31 +0000 (01:59 +0100)]
MDL-57133 lang: Reword the strings in Behat tests too
Helen Foster [Tue, 29 Nov 2016 00:49:28 +0000 (01:49 +0100)]
MDL-57133 lang: Merge English strings from the en_fix language pack
Ryan Wyllie [Tue, 29 Nov 2016 00:34:44 +0000 (00:34 +0000)]
MDL-57158 theme: add margin for icon in pull right menu
Rajesh Taneja [Mon, 28 Nov 2016 23:35:03 +0000 (07:35 +0800)]
MDL-57168 behat: Check for button not text
Mark Nelson [Thu, 24 Nov 2016 09:23:27 +0000 (17:23 +0800)]
MDL-56858 theme_boost: separate input description and label
Also added missing advanced and required form symbols.
Mark Nelson [Mon, 28 Nov 2016 08:47:00 +0000 (16:47 +0800)]
MDL-56682 mod_assign: ensure the variable is not null
Dan Poltawski [Mon, 28 Nov 2016 08:30:37 +0000 (08:30 +0000)]
Merge branch 'MDL-57176-master' of git://github.com/damyon/moodle
David Monllao [Mon, 28 Nov 2016 07:22:46 +0000 (15:22 +0800)]
Merge branch 'MDL-57124-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 28 Nov 2016 07:06:11 +0000 (15:06 +0800)]
MDL-57124 Boost: Login page styles (and signup)
Center logo / site name.
Add padding to logo / site name.
Serve retina images and resize with css.
Add a line under the logo / site name.
Don't show site name if there is a logo.
Obey nonavbar option in core_renderer.
Ankit Agarwal [Mon, 28 Nov 2016 06:52:25 +0000 (12:22 +0530)]
MDL-57090 hubs: Replace smart select with searchableselect
Damyon Wiese [Mon, 28 Nov 2016 06:46:32 +0000 (14:46 +0800)]
MDL-57176 blocks: Never never never dup blocks
Dont create duplicate blocks 'requiredbytheme' for any reason.
David Monllao [Mon, 28 Nov 2016 06:39:22 +0000 (14:39 +0800)]
Merge branch 'MDL-57158-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 28 Nov 2016 03:18:48 +0000 (03:18 +0000)]
MDL-57158 theme: fix icon margin in action menus
David Monllao [Mon, 28 Nov 2016 06:00:50 +0000 (14:00 +0800)]
Merge branch 'MDL-57156-master' of https://github.com/snake/moodle
Vladimir Zhirov [Sat, 26 Nov 2016 19:42:54 +0000 (23:42 +0400)]
MDL-57163 installation: fixed "Call to undefined function curl_version"
David Monllao [Mon, 28 Nov 2016 04:59:11 +0000 (12:59 +0800)]
Merge branch 'wip-mdl-57168' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 28 Nov 2016 00:53:53 +0000 (08:53 +0800)]
MDL-57168 behat: Fixed xpath to ensure active link is checked
Rajesh Taneja [Sun, 27 Nov 2016 23:58:30 +0000 (07:58 +0800)]
MDL-57168 behat: Return link is the existing category
Rajesh Taneja [Sun, 27 Nov 2016 23:57:31 +0000 (07:57 +0800)]
MDL-57168 behat: Ensure drawer is open before clicking the link
David Monllao [Mon, 28 Nov 2016 04:45:46 +0000 (12:45 +0800)]
Merge branch 'MDL-56619-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 28 Nov 2016 04:40:27 +0000 (12:40 +0800)]
Merge branch 'wip-mdl-57147' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 28 Nov 2016 04:15:30 +0000 (12:15 +0800)]
Merge branch 'MDL-57146-master' of git://github.com/damyon/moodle
Ryan Wyllie [Fri, 25 Nov 2016 02:30:12 +0000 (02:30 +0000)]
MDL-56619 theme: filemanager_selectlayout bootstrap 4 form styling
Jake Dallimore [Fri, 25 Nov 2016 07:54:16 +0000 (15:54 +0800)]
MDL-57156 themes: override caption alignment in theme boost
David Monllao [Mon, 28 Nov 2016 03:31:05 +0000 (11:31 +0800)]
Merge branch 'MDL-57122-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 23 Nov 2016 11:05:39 +0000 (16:35 +0530)]
MDL-57122 boost: Don't escape strings twice
Strings should always be escaped in templates not before
Ankit Agarwal [Wed, 23 Nov 2016 10:36:58 +0000 (16:06 +0530)]
MDL-57122 boost: Add context docs to login template
Jun Pataleta [Fri, 25 Nov 2016 06:48:11 +0000 (14:48 +0800)]
MDL-56919 boost: Render non-action menu items as disabled action links
Jun Pataleta [Fri, 25 Nov 2016 06:45:17 +0000 (14:45 +0800)]
MDL-56919 templates: action_link template fixes when disabled
For the case where the action_link template is shown as disabled:
* Allow extra classes to be set on on the class attribute.
* Allow extra attributes to be set.
Rajesh Taneja [Fri, 25 Nov 2016 01:55:27 +0000 (09:55 +0800)]
MDL-57147 phpunit: Check if time is greater than or equal to
Some windows only have 1/100 microtime resolution
so a lot of times it does not advance enough.
AMOS bot [Sat, 26 Nov 2016 16:05:45 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 25 Nov 2016 12:35:17 +0000 (12:35 +0000)]
Merge branch 'MDL-57134-master' of git://github.com/lameze/moodle
Dan Poltawski [Fri, 25 Nov 2016 11:17:36 +0000 (11:17 +0000)]
Merge branch 'wip-mdl-56659' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 25 Nov 2016 10:44:19 +0000 (10:44 +0000)]
Merge branch 'MDL-56800-master-radio' of git://github.com/mudrd8mz/moodle
David Monllao [Fri, 25 Nov 2016 07:58:02 +0000 (15:58 +0800)]
Moodle release 3.2rc3
David Monllao [Fri, 25 Nov 2016 07:58:02 +0000 (15:58 +0800)]
NOBUG: Fixed file access permissions
David Monllao [Fri, 25 Nov 2016 07:58:01 +0000 (15:58 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Fri, 25 Nov 2016 06:04:10 +0000 (14:04 +0800)]
MDL-56586 behat: fix behat tests to work with new add block
Rajesh Taneja [Fri, 25 Nov 2016 02:38:46 +0000 (10:38 +0800)]
MDL-56659 core: Enable password field when label is clicked
Rajesh Taneja [Wed, 23 Nov 2016 07:02:33 +0000 (15:02 +0800)]
MDL-56659 core: No need for noscript tag and set size later
1. BrowserKitDriver::setValue only checks if the element is
disabled. It still is able to set value on hidden elements
So there is no need for noscript tag in password unmask
2. Set size on hidden field is not valid html, so set it later
when text element is displayed
David Monllao [Fri, 25 Nov 2016 03:15:32 +0000 (11:15 +0800)]
Merge branch 'MDL-56584-master-fix1' of github.com/damyon/moodle
David Monllao [Fri, 25 Nov 2016 03:11:20 +0000 (11:11 +0800)]
Merge branch 'MDL-55324-master-fix' of git://github.com/cameron1729/moodle
David Monllao [Fri, 25 Nov 2016 02:52:00 +0000 (10:52 +0800)]
Merge branch 'MDL-57094-int-patch-1' of github.com:ryanwyllie/moodle
David Monllao [Fri, 25 Nov 2016 02:40:39 +0000 (10:40 +0800)]
Merge branch 'MDL-56801-master' of git://github.com/lameze/moodle
Ryan Wyllie [Fri, 25 Nov 2016 02:24:33 +0000 (02:24 +0000)]
MDL-57094 admin_tool: fix subscription behat tests
David Monllao [Fri, 25 Nov 2016 01:52:48 +0000 (09:52 +0800)]
MDL-56551 calendar: Update behat test according to DOM changes
Damyon Wiese [Fri, 25 Nov 2016 01:49:31 +0000 (09:49 +0800)]
MDL-57146 boost: New tabbed settings page missing branch links
Branches that are also links were not showing as links.
David Monllao [Fri, 25 Nov 2016 01:36:17 +0000 (09:36 +0800)]
Merge branch 'MDL-56761-master' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Fri, 25 Nov 2016 01:25:28 +0000 (09:25 +0800)]
MDL-56584 boost: Use tabindex-1 on nav drawer
Also use aria-hidden on unicode symbol for hamburger.
David Monllao [Fri, 25 Nov 2016 01:24:24 +0000 (09:24 +0800)]
Merge branch 'wip-mdl-56898-fix4' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Fri, 25 Nov 2016 01:20:52 +0000 (09:20 +0800)]
MDL-56898 behat: Focus only works with JS
David Monllao [Fri, 25 Nov 2016 01:18:26 +0000 (09:18 +0800)]
Merge branch 'MDL-57126-master' of https://github.com/snake/moodle
David Monllao [Fri, 25 Nov 2016 00:46:04 +0000 (08:46 +0800)]
Merge branch 'MDL-55857-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 25 Nov 2016 00:37:35 +0000 (08:37 +0800)]
MDL-57019 behat: corrections to the selectors, adding waiting
Jake Dallimore [Thu, 24 Nov 2016 06:41:38 +0000 (14:41 +0800)]
MDL-57126 core: add 'scss' to list of core filetypes.
This allows filetype restrictions to work when uploading additional
preset files on the Boost admin settings page.