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.
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.
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.
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
Andrew Nicols [Mon, 26 Oct 2015 01:46:38 +0000 (09:46 +0800)]
Merge branch 'MDL-51779_master' of https://github.com/Syxton/moodle
Eloy Lafuente (stronk7) [Sun, 25 Oct 2015 20:13:08 +0000 (21:13 +0100)]
MDL-51903 behat: move guest enrolment to new UI
With MDL-30674 we missed to change this use from the
old (course edition) UI to the new (enrolment methods) one.
Jun Pataleta [Sat, 24 Oct 2015 04:50:01 +0000 (23:50 -0500)]
MDL-51864 blocks: Fixed title display for block_course_summary
lazydaisy [Fri, 23 Oct 2015 17:19:18 +0000 (18:19 +0100)]
MDL-51127 theme_bootstrapbase: Re-aligned RTL context header button.
AMOS bot [Fri, 23 Oct 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files
Syxton [Wed, 14 Oct 2015 18:51:47 +0000 (14:51 -0400)]
MDL-51779 assign: PDF annotate quality
Fixes the quality of pdf content when annotating.
Dan Poltawski [Fri, 23 Oct 2015 12:47:50 +0000 (13:47 +0100)]
Moodle release 3.0beta
Dan Poltawski [Fri, 23 Oct 2015 12:47:49 +0000 (13:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 23 Oct 2015 12:45:44 +0000 (13:45 +0100)]
NOBUG: correcting pre-beta version name
Eloy Lafuente (stronk7) [Fri, 23 Oct 2015 11:31:59 +0000 (13:31 +0200)]
MDL-30674 enrol_guest: version bump in case it's needed for something
Eloy Lafuente (stronk7) [Fri, 23 Oct 2015 10:18:08 +0000 (12:18 +0200)]
Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle
Dan Poltawski [Fri, 23 Oct 2015 10:34:52 +0000 (11:34 +0100)]
MDL-40863 mod_resource: bump version
(not technically necessary - but I prefrer to make it explicit against
stable)
Dan Poltawski [Fri, 23 Oct 2015 10:27:57 +0000 (11:27 +0100)]
MDL-40863 mod_resource: add missing behat tag
Marina Glancy [Fri, 23 Oct 2015 09:50:16 +0000 (17:50 +0800)]
MDL-40863 mod_resource: do not cache user-specific info
Andrew Hancox [Fri, 2 Oct 2015 16:38:54 +0000 (17:38 +0100)]
MDL-40863 mod_resource: Add option to show modified date
Eloy Lafuente (stronk7) [Fri, 23 Oct 2015 08:42:17 +0000 (10:42 +0200)]
Merge branch 'MDL-51739-master-individual-locking' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 15 Oct 2015 07:29:02 +0000 (07:29 +0000)]
MDL-51739 theme: allow config to lock theme selector
If any of the devices have their theme set in config.php
it will lock the theme selector UI from being able to change
the theme.
Kevin Wiliarty [Mon, 19 Oct 2015 18:27:06 +0000 (14:27 -0400)]
MDL-51834 auth,profile: locks custom fields based on auth settings
Andrew Nicols [Fri, 23 Oct 2015 02:59:34 +0000 (10:59 +0800)]
Merge branch 'MDL-45515-master' of git://github.com/ryanwyllie/moodle
jinhofer [Mon, 19 Oct 2015 17:37:42 +0000 (12:37 -0500)]
MDL-45515 lib/editor/atto/plugins/table: added behat
jinhofer [Thu, 20 Aug 2015 14:59:34 +0000 (09:59 -0500)]
MDL-45515 atto/plugins: Added border style and BG colour to table
This commit adds the option for borders to be added and
styled, background colours to be set, and width to be set for tables
in the Atto HTML Editor. For those that desire to restrict
use of this, the plugin settings allow the admins to restrict
how much freedom their users have with borders.
Andrew Nicols [Fri, 23 Oct 2015 02:39:03 +0000 (10:39 +0800)]
MDL-30674 enrol_guest: Respect
AMOS bot [Thu, 22 Oct 2015 16:04:16 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 22 Oct 2015 13:43:20 +0000 (14:43 +0100)]
Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 22 Oct 2015 11:14:04 +0000 (12:14 +0100)]
MDL-51458 travis: note the purpose of config
Dan Poltawski [Thu, 22 Oct 2015 11:13:39 +0000 (12:13 +0100)]
Merge branch 'MDL-51458-master' of git://github.com/andrewnicols/moodle
Andrew Hancox [Thu, 1 Oct 2015 09:37:01 +0000 (10:37 +0100)]
MDL-30674 enrol_guest: Moved settings from course to enrol form
Added proper enrol settings form with status (enabled or disabled)
and password option in line with other core enrol plugins.
Removed enrol_guest settings from course settings page.
When adding a guest enrol plugin you now get presented with the
edit form as with other core enrol plugins.
Andrew Nicols [Thu, 22 Oct 2015 05:26:32 +0000 (13:26 +0800)]
Merge branch 'wip-MDL-46623-master' of git://github.com/marinaglancy/moodle
Vadim Dvorovenko [Sat, 17 Jan 2015 18:10:31 +0000 (01:10 +0700)]
MDL-46623 auth: Sheduled tasks for users sync
Sheduled tasks for syncing users with external sources for auth_ldap
and auth_cas. Using task is simplier than setting separate cron
job for running cli script. Task are disabled by default.
Andrew Nicols [Tue, 13 Oct 2015 06:51:29 +0000 (14:51 +0800)]
MDL-51737 core: Add Edge UserAgent support
Andrew Nicols [Wed, 21 Oct 2015 00:06:57 +0000 (08:06 +0800)]
MDL-51458 testing: Disable Travis notifications entirely
The Travis-CI service currently over-notifies the upstream repository
owner which can mean that committers without access to a fork of the
repository are notified of failures, and success changes.
Until this issue is addressed, and we are happy with the stability of our
build, we have disabled notification support.
The Travis-CI service problem has been raised in
https://github.com/travis-ci/travis-ci/issues/4976
Andrew Nicols [Fri, 18 Sep 2015 02:39:34 +0000 (10:39 +0800)]
MDL-51458 Testing: Support for Travis-CI.org
This commit adds support for community use of travis-ci.org and allows
developers to get free testing of their changes in multiple PHP
environments, and multiple database servers.
Use of this feature requires setup on travis-ci.org, and is not supported
by Moodle HQ.
Results supplied by travis-ci.org are for your convenience only, and tests
will still be applied separately by the HQ integration servers during
integration.
Dan Poltawski [Tue, 20 Oct 2015 13:56:33 +0000 (14:56 +0100)]
Merge branch 'MDL-50217' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 Oct 2015 08:57:22 +0000 (09:57 +0100)]
on-demand release 3.0dev+
Dan Poltawski [Tue, 20 Oct 2015 08:57:21 +0000 (09:57 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Mark Nelson [Tue, 20 Oct 2015 05:51:46 +0000 (22:51 -0700)]
MDL-51782 mod_forum: fixed unit test failing on certain DBs
Andrew Nicols [Tue, 20 Oct 2015 03:50:57 +0000 (11:50 +0800)]
Merge branch 'MDL-51782_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 20 Oct 2015 02:48:14 +0000 (10:48 +0800)]
Merge branch 'MDL-51162-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 20 Oct 2015 02:27:08 +0000 (10:27 +0800)]
MDL-51162 core: replace all HTTP_RAW_POST_DATA usages
This patch replace all usages of HTTP_RAW_POST_DATA that was deprecated on PHP 5.6 by
file_get_contents('php://input'). Only the TinyMCE library has not been updated.
Eloy Lafuente (stronk7) [Mon, 19 Oct 2015 21:14:35 +0000 (23:14 +0200)]
MDL-51836 mod_forum: Fix CASE statement breaking mssql & oracle.
Eloy Lafuente (stronk7) [Mon, 19 Oct 2015 16:10:40 +0000 (18:10 +0200)]
Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle
David Mudrák [Mon, 19 Oct 2015 15:43:12 +0000 (17:43 +0200)]
MDL-51832 tests: Fix failing code manager unit tests on Windows
Dan Poltawski [Mon, 19 Oct 2015 15:48:33 +0000 (16:48 +0100)]
MDL-51792 js: grunt built
Eloy Lafuente (stronk7) [Mon, 19 Oct 2015 11:33:10 +0000 (13:33 +0200)]
Merge branch 'wip-mdl-48117' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 19 Oct 2015 14:19:41 +0000 (15:19 +0100)]
Merge branch 'm30_MDL-51554_Apache_PHP-FPM_Broken_File_Serving' of https://github.com/scara/moodle
David Monllao [Mon, 19 Oct 2015 09:21:58 +0000 (17:21 +0800)]
Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle
David Monllao [Mon, 19 Oct 2015 09:06:03 +0000 (17:06 +0800)]
Merge branch 'MDL-50483-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 19 Oct 2015 08:46:42 +0000 (16:46 +0800)]
MDL-48117 behat: Use form field to check checkbox
On Mac-Chrome click checkbox is not generating
proper events and hence failing. Use behat_form_checkbox
to ensure checkbox is checked
Ryan Wyllie [Fri, 16 Oct 2015 08:06:43 +0000 (08:06 +0000)]
MDL-51792 forms: stop deletion of select options
Stopped the keyboard navigation from completely deleting
list options when being deselected using keyboard navigation.
They are now returned to the list of available options to be
reselected.
Also remove the cross from the selected element when it is
a single select box.
David Monllao [Mon, 19 Oct 2015 08:27:41 +0000 (16:27 +0800)]
Merge branch 'MDL-51771' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 13 May 2015 08:58:13 +0000 (09:58 +0100)]
MDL-50217 questions: sensible default order for add new qtype
This default will only affect new installs.
David Monllao [Mon, 19 Oct 2015 07:42:55 +0000 (15:42 +0800)]
Merge branch 'MDL-51712-master' of git://github.com/xow/moodle
Andrew Nicols [Mon, 19 Oct 2015 05:38:53 +0000 (13:38 +0800)]
Merge branch 'MDL-51673-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)]
Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)]
Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle
Adam Olley [Wed, 16 Sep 2015 06:42:21 +0000 (16:12 +0930)]
MDL-50993 forum: Display timed posts/discussions in a logical order
Users that don't have permission to view timed posts outside of the release
time frame will have discussions that have entered the visible frame appear
in an odd order from their point of view on the discussion list.
Example:
Discussion 1, modified 2015-01-01, hidden till 2015-01-03
Discussion 2, modified 2015-01-02, not hidden
The standard 'modified descending' order means that D2 is listed at the top
even after D1 becomes visible. When scanning the list of discussions for new
posts, the user could be tricked into thinking they'd already read it.
This fix instead takes into account the release time of the discussion when
timed forum posts are enabled.
I opted to use CASE statements to handle this instead of GREATEST as the
latter is not supported by MSSQL.
Simey Lameze [Fri, 16 Oct 2015 06:28:38 +0000 (14:28 +0800)]
MDL-50483 gradereport_user: fix overlapping on the error message
Jinu Abraham [Mon, 31 Aug 2015 05:18:31 +0000 (14:48 +0930)]
MDL-50483 gradereport_user: fix the fatal error of no enrolled users
Andrew Nicols [Sun, 18 Oct 2015 23:56:51 +0000 (07:56 +0800)]
Merge branch 'MDL-50412-master' of git://github.com/danpoltawski/moodle
Tim Hunt [Sun, 18 Oct 2015 15:03:29 +0000 (16:03 +0100)]
MDL-51771 question engine: fix typo in SQL
Thanks to Pete at learningpool.com for finding thsi bug.
Jun Pataleta [Fri, 16 Oct 2015 21:05:30 +0000 (16:05 -0500)]
MDL-51673 messages: Added codes for the unit tests
Matteo Scaramuccia [Fri, 25 Sep 2015 01:07:49 +0000 (03:07 +0200)]
MDL-51554 Files: Fix broken file serving under Apache + PHP-FPM
Ben Kelada [Tue, 6 Oct 2015 04:09:42 +0000 (15:09 +1100)]
MDL-51673 messages: remove strict type check of int vs string
AMOS bot [Fri, 16 Oct 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 16 Oct 2015 14:22:37 +0000 (15:22 +0100)]
MDL-49329 fixtures: remove trailing whitespace