Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 18:00:41 +0000 (19:00 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 11:51:29 +0000 (12:51 +0100)]
Merge branch 'wip-mdl-52007' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Nov 2015 11:30:23 +0000 (12:30 +0100)]
Merge branch 'wip-mdl-52020' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Nov 2015 08:46:43 +0000 (08:46 +0000)]
Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Tue, 3 Nov 2015 02:57:14 +0000 (10:57 +0800)]
Merge branch 'MDL-51993-master' of git://github.com/cameron1729/moodle
AMOS bot [Tue, 3 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
rajesh Taneja [Mon, 2 Nov 2015 07:08:38 +0000 (15:08 +0800)]
MDL-52007 behat: Use extended timeout for site admin expansion
Cameron Ball [Mon, 2 Nov 2015 07:56:35 +0000 (15:56 +0800)]
MDL-51993 course: Set valid default for section_edit_control_menu
Thank you to Gareth Barnard for originally providing this patch.
Andrew Nicols [Tue, 3 Nov 2015 01:42:04 +0000 (09:42 +0800)]
Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
rajesh Taneja [Tue, 3 Nov 2015 01:40:33 +0000 (09:40 +0800)]
MDL-52020 behat: Removed text checking to ensure window switch
Comment question window closes after 2 sec.
which crashes win-FF as it's slow to check for
"Changes saved" text. As after switching it is
checked the changes are saved, this step can be
avoided to ensure robustness of the scenario
Tim Hunt [Fri, 30 Oct 2015 16:52:26 +0000 (16:52 +0000)]
MDL-51914 qtype_ddmarker: fix checking points on the boundary
All points on the boundary are now considered in the shape, on the
grounds that it is better to grade someone right for an edge case.
David Mudrák [Mon, 2 Nov 2015 21:30:46 +0000 (22:30 +0100)]
MDL-52018 lang: Fix behat tests to use the new strings
Helen Foster [Mon, 2 Nov 2015 21:12:06 +0000 (22:12 +0100)]
MDL-52018 lang: Merge English strings from the en_fix language pack
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 19:02:16 +0000 (20:02 +0100)]
Merge branch 'MDL-52014-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)]
Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)]
Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle
Dan Poltawski [Mon, 2 Nov 2015 16:15:47 +0000 (16:15 +0000)]
MDL-52014 quiz: do not log preview attempt deletions
This happens automatically by the system.
Dan Poltawski [Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)]
Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 2 Nov 2015 14:04:44 +0000 (14:04 +0000)]
Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle
Marina Glancy [Mon, 2 Nov 2015 09:52:59 +0000 (17:52 +0800)]
MDL-50633 dml: deprecated var replaced in mysql 5.7
Thanks to Charles Verge for providing a patch
Dan Poltawski [Mon, 2 Nov 2015 09:08:01 +0000 (09:08 +0000)]
Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle
Andrew Nicols [Mon, 2 Nov 2015 06:36:10 +0000 (14:36 +0800)]
Merge branch 'MDL-51707-m' of https://github.com/micaherne/moodle
Andrew Nicols [Mon, 2 Nov 2015 03:54:21 +0000 (11:54 +0800)]
Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle
Marina Glancy [Mon, 2 Nov 2015 02:53:43 +0000 (10:53 +0800)]
MDL-51999 user: remove unnecessary continue
Andrew Nicols [Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)]
Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 29 Oct 2015 07:56:20 +0000 (15:56 +0800)]
MDL-51888 mod_resource: cache file details for performance
If file details (size, type, date) are configured to be displayed we cache them
in course cache raw and build the display string in user language/timezone when
displaying. Also changed behat test not to fail in 2016
Damyon Wiese [Fri, 30 Oct 2015 04:15:28 +0000 (12:15 +0800)]
MDL-51964 autocomplete: IE11 fires spurious "input" events
We need to check for "real" changes to the input value because
ie11 is just firing events willy nilly.
AMOS bot [Sat, 31 Oct 2015 16:07:45 +0000 (00:07 +0800)]
Automatically generated installer lang files
Jun Pataleta [Fri, 30 Oct 2015 21:53:26 +0000 (16:53 -0500)]
MDL-47073 lib: Replace backslashes with slashes in jquery plugin urls
This patch replaces backslash characters in the generated jQuery
plugin URL to forward slashes when slasharguments is disabled and
the Moodle server is running on IIS.
Thanks to Ryan Panning <Ryan.Panning@district196.org> for
reporting this issue and for suggesting a fix.
Dan Poltawski [Fri, 30 Oct 2015 21:09:21 +0000 (21:09 +0000)]
on-demand release 3.0beta+
Dan Poltawski [Fri, 30 Oct 2015 21:09:20 +0000 (21:09 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Fri, 30 Oct 2015 09:23:52 +0000 (10:23 +0100)]
Merge branch 'wip-mdl-51981' of https://github.com/rajeshtaneja/moodle
rajesh Taneja [Fri, 30 Oct 2015 03:17:11 +0000 (11:17 +0800)]
MDL-51981 behat: No need for JS tag
This scenario crashes win-chrome and probably
other comninations. Looking at this, it seems
js tag is not needed, so removing js tag to make
it pass on all OS
Andrew Nicols [Fri, 30 Oct 2015 03:01:00 +0000 (11:01 +0800)]
Merge branch 'wip-MDL-51552-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Fri, 30 Oct 2015 01:57:57 +0000 (09:57 +0800)]
MDL-51552 gradebook: Update to singleview behat test.
Andrew Nicols [Thu, 29 Oct 2015 23:56:25 +0000 (07:56 +0800)]
MDL-51966 forms: Typo correction
Andrew Nicols [Thu, 29 Oct 2015 23:31:28 +0000 (07:31 +0800)]
Merge branch 'wip-MDL-51966-master' of https://github.com/marinaglancy/moodle
AMOS bot [Thu, 29 Oct 2015 16:04:09 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)]
Merge branch 'MDL-51955' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 29 Oct 2015 13:54:56 +0000 (13:54 +0000)]
Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 29 Oct 2015 11:54:45 +0000 (12:54 +0100)]
MDL-51939 mod_forum: all participants discussions are viewed by students
Added scenario to verify that "all participants" discussions, under
separate-groups mode are, by default, visible for students.
Andrew Nicols [Wed, 28 Oct 2015 03:55:16 +0000 (11:55 +0800)]
MDL-51939 mod_forum: Fix groupid data on upgrade
This upgrade step addresses issues identified in MDL-51939 where the
groupid was incorrectly set. The issue itself is not present in 2.9, but
this upgrade step is required to correct any incorrect data.
Eloy Lafuente (stronk7) [Thu, 29 Oct 2015 12:19:36 +0000 (13:19 +0100)]
MDL-51955 testing: Exported files may be smaller than expected
Open a bit the allowed size expectation to accomodate oracle
producing smaller files when outputing decimal numbers.
Dan Poltawski [Thu, 29 Oct 2015 10:53:40 +0000 (10:53 +0000)]
Merge branch 'MDL-50811-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Thu, 29 Oct 2015 10:35:03 +0000 (10:35 +0000)]
Merge branch 'MDL-51921-master' of git://github.com/junpataleta/moodle
Adrian Greeve [Mon, 12 Oct 2015 08:43:22 +0000 (16:43 +0800)]
MDL-51552 gradebook: Single view bulk insert fix.
Single view now doesn't overwrite non-empty grades.
A thank you to Sam Anderson and Robert Russo for providing a patch.
Marina Glancy [Thu, 29 Oct 2015 05:49:56 +0000 (13:49 +0800)]
MDL-51966 forms: case-insensitive search in autocomplete
Andrew Nicols [Thu, 29 Oct 2015 06:48:25 +0000 (14:48 +0800)]
Merge branch 'MDL-51923-master-2' of git://github.com/xow/moodle
Andrew Nicols [Thu, 29 Oct 2015 06:41:45 +0000 (14:41 +0800)]
Merge branch 'MDL-51915' of git://github.com/timhunt/moodle
Andrew Nicols [Thu, 29 Oct 2015 05:16:15 +0000 (13:16 +0800)]
Merge branch 'MDL-51799-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 26 Oct 2015 07:02:03 +0000 (07:02 +0000)]
MDL-51799 javascript: dialogue accessibility
Moved setting the aria visiblity of the dialogues from the show
and hide functions into the visibility change handler to stop
multiple calls.
Also made the visibility checker just continue to buffer the elements
it hides, rather than clearning them, on multiple calls.
Andrew Nicols [Thu, 29 Oct 2015 03:06:18 +0000 (11:06 +0800)]
Merge branch 'MDL-51956-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 29 Oct 2015 02:32:01 +0000 (02:32 +0000)]
MDL-51956 atto_table: fix bg colour bug
The table editor will now set the backgorund colour on the
table in Firefox version 34 and below.
Also expanded the dialogue slightly because the colour choices
were wrapping and I added some styling to put a gap in for the
metric markers for border width and table width.
Dan Poltawski [Wed, 28 Oct 2015 12:48:18 +0000 (12:48 +0000)]
Merge branch 'wip-MDL-51919-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Oct 2015 12:04:20 +0000 (12:04 +0000)]
Merge branch 'MDL-51924-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Wed, 28 Oct 2015 11:22:36 +0000 (11:22 +0000)]
Merge branch 'MDL-51838-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 28 Oct 2015 11:10:38 +0000 (11:10 +0000)]
Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 26 Oct 2015 17:40:26 +0000 (17:40 +0000)]
MDL-51914 qtype_ddmarker: precise grading round the edges of zones
There was a previous change to the CSS (7px -> 3px) to make things
look prettier, which acutally broke the grading by a few pixes.
I fixed this by:
* Changing the offset of the cross hairs back to the correct value,
and adding a comment to point out the imporance of not changing
that CSS.
* Achieved the nice layout of the label relative to the cross-hairs
in a different way.
* Added a similar clafirying comment in the JavaScript.
* Improved how the grid on the editing form is aligned with the
background image.
* Added rounding to the grading code, to cope better now that
browsers do sub-pixel positioning.
Jun Pataleta [Tue, 27 Oct 2015 18:41:34 +0000 (13:41 -0500)]
MDL-51921 files: Fixes for file manager issues
Fixed the issue where the file path select box goes beyond the
container with very long folder names. Instead of setting to
"width: auto", I set it the select box's "width: 100%" so that it will
just fill up its container's width.
Fixed the issue where markups are being shown on file aliases.
Rajneel Totaram [Tue, 27 Oct 2015 06:07:12 +0000 (18:07 +1200)]
MDL-51923 enrol: Enrolment list filter 'No Group' shows incorrect count
With contributions from John Okely
Adrian Greeve [Wed, 28 Oct 2015 02:36:15 +0000 (10:36 +0800)]
MDL-51919 forms lib: Autocomplete doesn't hide prematurely.
Quickly navigating via the keyboard to an autocomplete
element and hitting down would result in the selections
being displayed and then quickly removed. This has now
been fixed.
Andrew Nicols [Wed, 28 Oct 2015 04:59:31 +0000 (12:59 +0800)]
on-demand release 3.0beta+
Andrew Nicols [Wed, 28 Oct 2015 04:59:25 +0000 (12:59 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Wed, 28 Oct 2015 03:39:17 +0000 (11:39 +0800)]
MDL-51880 atto_table: Coding style fix
Andrew Nicols [Wed, 28 Oct 2015 03:37:17 +0000 (11:37 +0800)]
Merge branch 'MDL-51880-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Fri, 23 Oct 2015 07:19:50 +0000 (07:19 +0000)]
MDL-51880 atto/plugins/table: improve table borders
* Removed the "No borders" option from general borders setting
since it's a style choice.
* Added inherit, initial and unset as border style options.
* Made the border settings disabled if "Theme default" is selected.
* Changed the transparent colour to be "Theme default" which means
apply no colour at all.
Dan Poltawski [Tue, 27 Oct 2015 14:43:00 +0000 (14:43 +0000)]
Merge branch 'MDL-51893' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 27 Oct 2015 11:57:20 +0000 (11:57 +0000)]
Merge branch 'MDL-51863' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 27 Oct 2015 10:49:10 +0000 (10:49 +0000)]
Merge branch 'MDL-51906-master-fixes' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 27 Oct 2015 10:31:23 +0000 (18:31 +0800)]
MDL-51906 testing: Hardcode branch name
Eloy Lafuente (stronk7) [Tue, 27 Oct 2015 08:55:04 +0000 (09:55 +0100)]
MDL-51893 core_date: Stop using Pacific/Norfolk as 11.5 replacement
Norfolk Island's standard time (NFT) was on UTC+11:30 until 4 October
2015, when it was changed to UTC+11:00. So it's not suitable for 11.5
bad mapping replacement anymore.
It seems that there isn't any other location using such 11.5 timezone
so completely getting rid of it for conversions.
Barbara Ramiro [Tue, 27 Oct 2015 08:13:43 +0000 (16:13 +0800)]
MDL-51924 Using box-sizing mixin to prevent blocks overlap on profile page
Corey Wallis [Mon, 31 Aug 2015 00:49:27 +0000 (10:19 +0930)]
MDL-50811 mod_forum: Add completion tracking for emailed replies
Andrew Nicols [Tue, 27 Oct 2015 06:50:55 +0000 (14:50 +0800)]
Merge branch 'MDL-51905-master' of git://github.com/xow/moodle
John Okely [Mon, 26 Oct 2015 09:11:57 +0000 (17:11 +0800)]
MDL-51905 block_activity_results: Default to the current activity
Due to an incorrect condition, the activity results block would
incorrectly identify some blocks as not being gradeable.
This meant that edit form could not determine what activity the block
was added to. This commit fixes the condition, allowing the current
block to be determined correctly
Andrew Nicols [Tue, 27 Oct 2015 03:13:44 +0000 (11:13 +0800)]
Merge branch 'wip-MDL-51840-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 27 Oct 2015 03:03:43 +0000 (11:03 +0800)]
Merge branch 'wip-MDL-51841-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 27 Oct 2015 02:57:45 +0000 (10:57 +0800)]
Merge branch 'MDL-51864-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 27 Oct 2015 02:47:48 +0000 (10:47 +0800)]
Merge branch 'MDL-51127-master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 26 Oct 2015 16:59:40 +0000 (17:59 +0100)]
MDL-51863 packer: ensure empty zip files behavior remains consistent
With PHP bug #70322 fixed, ZipArchive::close() did start returning false
and throwing PHP Warnings with recent PHP versions (5.6.14 and up).
Previously (5.6.13 verified) it was returning true, and false in older
versions (5.4.x verified).
This change does silent the 2 "hacky" calls to close() that we perform
in core leaving the 3rd one (used for files having files) unmodified.
A new unit test has been created to cover the close() behavior, ideally
supporting both old and new PHP versions without harcoding any PHP
version.
Note that we don't use to rely much on results coming from close(), and
that's a good thing given the buggy behavior commented above. This just
keeps empty zips working like they were before.
Tim Hunt [Mon, 26 Oct 2015 18:15:30 +0000 (18:15 +0000)]
MDL-51915 lib tests: Extra unit test for html_to_text.
Dan Poltawski [Mon, 26 Oct 2015 13:54:41 +0000 (13:54 +0000)]
Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle
Dan Poltawski [Mon, 26 Oct 2015 13:49:32 +0000 (13:49 +0000)]
Merge branch 'MDL-51906-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 26 Oct 2015 12:40:15 +0000 (12:40 +0000)]
Merge branch 'MDL-51894-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 26 Oct 2015 10:20:02 +0000 (10:20 +0000)]
Merge branch 'MDL-51855-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 26 Oct 2015 08:59:21 +0000 (09:59 +0100)]
Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
Simey Lameze [Mon, 26 Oct 2015 07:52:11 +0000 (15:52 +0800)]
MDL-51824 auth: include required CLI library
Adrian Greeve [Wed, 21 Oct 2015 05:34:35 +0000 (13:34 +0800)]
MDL-51840 forms lib: keyboard navigation with ajax works.
Ajax autocomplete forms can now be navigated properly with
the keyboard.
Adrian Greeve [Thu, 22 Oct 2015 03:56:28 +0000 (11:56 +0800)]
MDL-51841 forms lib: Autocomplete fields work with spaces.
Adrian Greeve [Thu, 22 Oct 2015 03:56:28 +0000 (11:56 +0800)]
MDL-51841 forms lib: Autocomplete fields work with spaces.
Damyon Wiese [Mon, 19 Oct 2015 06:20:20 +0000 (14:20 +0800)]
MDL-51821 forms: Be more explicit in autocomplete if no suggestions
Damyon Wiese [Mon, 19 Oct 2015 06:02:42 +0000 (14:02 +0800)]
MDL-51821 forms: Better handling for deselecting items in autocomplete
Fixes 3 problems with deselecting items in an autocomplete field:
1. Keep track of whether items were in the offical suggestion list, or are newly created
tags and remove the "newly created tags" from the suggestion list when they are
deselected
2. Change the aria-role for the selected items list when items cannot be deselected (and
do not treat it like a multiselect list).
3. When leaving and returning focus to the selected items list, remember the last
active-descendant.
Andrew Nicols [Mon, 26 Oct 2015 05:56:49 +0000 (13:56 +0800)]
Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
Simey Lameze [Thu, 22 Oct 2015 02:59:23 +0000 (10:59 +0800)]
MDL-51824 core: initial deprecation of auth sync CLI scripts
This commit does the initial deprecation of the CLI scripts of CAS and LDAP authentication plugins.
Damyon Wiese [Mon, 26 Oct 2015 04:20:33 +0000 (12:20 +0800)]
MDL-51838 autocomplete: Scroll the suggestions list
Keep the active item "visible" when using keyboard nav on a long list of suggestions.
Andrew Nicols [Mon, 26 Oct 2015 03:07:37 +0000 (11:07 +0800)]
MDL-51894 inboundmessage: Ensure that all mailboxes exist
Andrew Nicols [Mon, 26 Oct 2015 01:38:44 +0000 (09:38 +0800)]
MDL-51906 testing: Fix travis builds for beta/rc
These were previously checking the release string for presence of the 'dev'
string. On friday we moved to beta, and will shortly move to RC.
We should be checking the version maturity instead.
This change switches to checking for MATURITY_STABLE in the maturity
string. If it is found, the branch behaviour follows the $branch version.
If it is not found, we use master.
This also adds a check to ensure that if the branch is not found, we exit
early instead of performing CI Tests over the entirety of Moodle.
Simey Lameze [Thu, 22 Oct 2015 06:09:54 +0000 (14:09 +0800)]
MDL-51855 mod_question: fix offset error during upgrade
Andrew Nicols [Mon, 26 Oct 2015 03:29:02 +0000 (11:29 +0800)]
Merge branch 'MDL-51842-master' of git://github.com/xow/moodle
John Okely [Tue, 20 Oct 2015 06:03:20 +0000 (14:03 +0800)]
MDL-51842 theme_bootstrapbase: Fix alignment of parallel buttons