Commit graph

76095 commits

Author SHA1 Message Date
Dan Poltawski
ec2e5c4151 NOBUG: correcting pre-beta version name 2015-10-23 13:46:59 +01:00
Eloy Lafuente (stronk7)
e326fbeea2 MDL-30674 enrol_guest: version bump in case it's needed for something 2015-10-23 13:31:59 +02:00
Eloy Lafuente (stronk7)
2ee8636553 Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle 2015-10-23 12:46:53 +02:00
Dan Poltawski
8c976328c1 MDL-40863 mod_resource: bump version
(not technically necessary - but I prefrer to make it explicit against
stable)
2015-10-23 11:34:52 +01:00
Dan Poltawski
94b8c29248 MDL-40863 mod_resource: add missing behat tag 2015-10-23 11:27:57 +01:00
Marina Glancy
9a58434601 MDL-40863 mod_resource: do not cache user-specific info 2015-10-23 11:25:51 +01:00
Andrew Hancox
ba8b641dce MDL-40863 mod_resource: Add option to show modified date 2015-10-23 11:25:07 +01:00
Eloy Lafuente (stronk7)
d9b60d6f25 Merge branch 'MDL-51739-master-individual-locking' of git://github.com/ryanwyllie/moodle 2015-10-23 10:42:17 +02:00
Ryan Wyllie
f1ecad609a 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.
2015-10-23 05:06:21 +00:00
Kevin Wiliarty
b71890687a MDL-51834 auth,profile: locks custom fields based on auth settings 2015-10-22 23:39:49 -04:00
Andrew Nicols
0b7dc6e8cd Merge branch 'MDL-45515-master' of git://github.com/ryanwyllie/moodle 2015-10-23 10:59:34 +08:00
jinhofer
f067581828 MDL-45515 lib/editor/atto/plugins/table: added behat 2015-10-23 02:57:51 +00:00
jinhofer
b87e11c849 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.
2015-10-23 02:57:50 +00:00
Andrew Nicols
5164b76e75 MDL-30674 enrol_guest: Respect 2015-10-23 10:40:42 +08:00
AMOS bot
32440787d4 Automatically generated installer lang files 2015-10-23 00:04:16 +08:00
Dan Poltawski
0a05907873 Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle 2015-10-22 14:43:20 +01:00
Dan Poltawski
cf84a5d2dd MDL-51458 travis: note the purpose of config 2015-10-22 12:14:04 +01:00
Dan Poltawski
c7ec75d670 Merge branch 'MDL-51458-master' of git://github.com/andrewnicols/moodle 2015-10-22 12:13:39 +01:00
Andrew Hancox
0c93dda8af 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.
2015-10-22 11:52:18 +01:00
Andrew Nicols
3ba7bf006e Merge branch 'wip-MDL-46623-master' of git://github.com/marinaglancy/moodle 2015-10-22 13:26:32 +08:00
Vadim Dvorovenko
e96ac9156d 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.
2015-10-22 12:45:57 +08:00
Andrew Nicols
39a731efb4 MDL-51737 core: Add Edge UserAgent support 2015-10-22 08:37:27 +08:00
Paul Nicholls
ca50279d4e MDL-51854 atto_image: Allow other plugins to handle drop events
The drop handler should only return false if it has actually handled the
drop event (i.e. it was an image) - otherwise, Atto plugins loaded after
this one don't get an opportunity to handle other drop events.
2015-10-22 11:58:57 +13:00
Andrew Nicols
ab17b4f7ee 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
2015-10-21 08:13:12 +08:00
Andrew Nicols
88ec08605b 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.
2015-10-21 08:13:12 +08:00
Dan Poltawski
de2a3b7423 Merge branch 'MDL-50217' of git://github.com/timhunt/moodle 2015-10-20 14:56:33 +01:00
Dan Poltawski
91aaa240f5 on-demand release 3.0dev+ 2015-10-20 09:57:22 +01:00
Dan Poltawski
0e74fa11cd Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-10-20 09:57:21 +01:00
Dani Palou
dbcade703b MDL-51829 admin: Set userquota setting as PARAM_INT 2015-10-20 10:01:11 +02:00
Mark Nelson
e7be37b1c2 MDL-51782 mod_forum: fixed unit test failing on certain DBs 2015-10-20 14:44:58 +08:00
Andrew Nicols
579b72a227 Merge branch 'MDL-51782_master' of git://github.com/markn86/moodle 2015-10-20 11:50:57 +08:00
Andrew Nicols
dc2091c87f Merge branch 'MDL-51162-master' of git://github.com/lameze/moodle 2015-10-20 10:48:14 +08:00
Simey Lameze
4d16a2749f 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.
2015-10-20 10:27:26 +08:00
Jun Pataleta
b47454f6b7 MDL-51837 user: Check if user email is set on validation
Add a check if the user's email is set before performing validation on
the user's email address. This is to prevent the warning messages to
be shown in the case of a pending email change which causes the user's
email field to be not included in the Edit profile form.
2015-10-19 16:50:01 -05:00
Eloy Lafuente (stronk7)
d6ed5f8230 MDL-51836 mod_forum: Fix CASE statement breaking mssql & oracle. 2015-10-19 23:14:35 +02:00
Eloy Lafuente (stronk7)
9062fa25ae Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle 2015-10-19 18:10:40 +02:00
David Mudrák
c8a6d162a0 MDL-51832 tests: Fix failing code manager unit tests on Windows 2015-10-19 18:08:59 +02:00
Dan Poltawski
319310a57c MDL-51792 js: grunt built 2015-10-19 16:48:33 +01:00
Eloy Lafuente (stronk7)
a180068e74 Merge branch 'wip-mdl-48117' of https://github.com/rajeshtaneja/moodle 2015-10-19 16:59:05 +02:00
Dan Poltawski
a7dacbc77d Merge branch 'm30_MDL-51554_Apache_PHP-FPM_Broken_File_Serving' of https://github.com/scara/moodle 2015-10-19 15:19:41 +01:00
David Monllao
7d45554019 Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle 2015-10-19 17:21:58 +08:00
David Monllao
d80d38a936 Merge branch 'MDL-50483-master' of git://github.com/lameze/moodle 2015-10-19 17:06:03 +08:00
Eloy Lafuente (stronk7)
6d04e5511e 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
2015-10-19 17:00:24 +08:00
Ryan Wyllie
563fe0a569 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.
2015-10-19 09:39:06 +01:00
David Monllao
e54193ed3e Merge branch 'MDL-51771' of git://github.com/timhunt/moodle 2015-10-19 16:27:41 +08:00
Tim Hunt
9872f0a8b8 MDL-50217 questions: sensible default order for add new qtype
This default will only affect new installs.
2015-10-19 08:43:13 +01:00
David Monllao
96a6b6b20b Merge branch 'MDL-51712-master' of git://github.com/xow/moodle 2015-10-19 15:42:55 +08:00
Andrew Nicols
1b69ba3dd7 Merge branch 'MDL-51673-master' of git://github.com/junpataleta/moodle 2015-10-19 13:38:53 +08:00
David Monllao
1ed96351aa Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle 2015-10-19 13:30:17 +08:00
Andrew Nicols
c95ba7faa8 Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle 2015-10-19 12:43:40 +08:00