19665 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
2015-01-28 01:02:54 +01:00
Eloy Lafuente (stronk7)
215c37097e Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle 2015-01-28 00:36:14 +01:00
Eloy Lafuente (stronk7)
73bf1119dd Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle 2015-01-27 21:18:24 +01:00
Neill Magill
8072628a67 MDL-48177 core: Plugin environment checks with no version of Moodle
The environment.xml files in plugins force you to define the versions of Moodle that the checks should be carried out against.
For community plugins the environment requirements of the plugin seem unlikely to be dependant on the version of Moodle.

This patch will allow the environment.xml files to use a new <PLUGIN> tag in place of the <MOODLE version="> tag.

This solution has the following properties:

* The Environment file will not break versions of Moodle that do not support the PLUGIN syntax.
* Specific versioned MOODLE tags can still be defined for versions of Moodle that do not have this patch.
* If both MOODLE and PLUGIN tags exist the PLUGIN tag will be used in preference.
* The PLUGIN tag will not function in the main Moodle environment.xml file.
* The PLUGIN tag has a mandatory name attribute that must match the frankenstyle name of the plugin being tested.
2015-01-27 13:08:47 +01:00
Eloy Lafuente (stronk7)
61b31b4e10 Merge branch 'MDL-48383-master' of git://github.com/FMCorz/moodle 2015-01-27 12:01:04 +01:00
David Monllao
58f2c3ca5c MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-01-27 10:43:29 +08:00
Andrew Nicols
96a5463119 MDL-48685 core_useragent: Correct IE 5.0 issues 2015-01-27 08:36:20 +08:00
Andrew Nicols
83af132901 MDL-48685 tests: Add testing for supports_json_contenttype 2015-01-27 08:36:20 +08:00
Andrew Nicols
5ee4f58134 MDL-48685 tests: Add additional User Agents
* Firefox 33; Mac OS X 10.10
* Chrome 39; Mac OS X
* Safari; iPhone 6 Plus; iOS 8.1; Build 12B411
* Opera 12.15 (Build 1748); Mac OS X
2015-01-27 08:36:20 +08:00
Andrew Nicols
7c10ad334d MDL-48685 tests: Rewrite useragent tests 2015-01-27 08:36:19 +08:00
Eloy Lafuente (stronk7)
c07962d56d Merge branch 'MDL-48916' of https://github.com/wesleysitu/moodle 2015-01-27 01:06:43 +01:00
Eloy Lafuente (stronk7)
0e134b76b5 Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle 2015-01-27 00:56:51 +01:00
Eloy Lafuente (stronk7)
3195a1f91f Merge branch 'MDL-48939-master' of git://github.com/andrewnicols/moodle 2015-01-26 23:57:33 +01:00
Eloy Lafuente (stronk7)
d82ab7bf22 Merge branch 'MDL-48616-master' of git://github.com/jethac/moodle 2015-01-26 23:47:14 +01:00
Eloy Lafuente (stronk7)
e6b1816588 MDL-48266 backup: make upgrade step to match current version bump. 2015-01-26 19:22:44 +01:00
Eloy Lafuente (stronk7)
16dafa5d9f Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2015-01-26 19:19:35 +01:00
Eloy Lafuente (stronk7)
b646a710ba Merge branch 'MDL-43421' of git://github.com/mr-russ/moodle 2015-01-26 10:24:51 +01:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
sam marshall
b3d7eb6ed4 MDL-48946 Files: New custom description format_string call
The format_string call used when getting file type descriptions
does not specify a context. The page context is not always
available at this point, so for consistency it should specify
the system context.
2015-01-22 13:27:50 +00:00
Frederic Massart
94b8c63635 MDL-48266 backup: Fix backup strorage misconfiguration
Basically if the destination dir is empty then the storage
type should be set to the course backup area. This does
not affect the behaviour of the backups that lived with
misconfigured settings.
2015-01-22 17:49:26 +08:00
Frederic Massart
9fdf16a0fc MDL-48266 backup: Validate backup_auto_storage config 2015-01-22 17:48:07 +08:00
Andrew Nicols
2f19417319 MDL-48939 core: Depreacte search_generate_text_SQL
This has never been used outside of forum, where it was introduced in
Moodle 1.8 and required manual creation of an index.
2015-01-22 15:10:00 +08:00
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle"
This reverts commit e08f58288af17bea8d55b66dae697d9d917053f4, reversing
changes made to 782ea98c59945864cfcc3ab44a6f17d49a9ed39f.
2015-01-22 12:13:35 +08:00
Frederic Massart
18247eb090 MDL-48383 task: Indicate when a task will not run if plugin is disabled 2015-01-22 11:07:52 +08:00
Andrew Nicols
81a9b9cee3 Merge branch 'wip-mdl-48761' of https://github.com/rajeshtaneja/moodle 2015-01-21 10:21:24 +08:00
Rajesh Taneja
d58b0ad6f1 MDL-48761 behat: Added new step for debugging scenarios 2015-01-21 10:16:22 +08:00
David Monllao
59da38ef8a Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle 2015-01-21 09:52:55 +08:00
Andrew Nicols
da992717f4 MDL-28513 install: Add adminemail to the CLI installers 2015-01-21 09:42:51 +08:00
Wesley Situ
7be4cf1873 MDL-48916 atto_undo: Clarify text for "Undo/Redo" 2015-01-20 16:21:35 -08:00
Eloy Lafuente (stronk7)
2d78593650 Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle 2015-01-21 00:03:56 +01:00
Dan Poltawski
75a67b0650 Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle 2015-01-20 17:50:19 +00:00
Narissa Bayler
1e65cb2557 MDL-48616 editor_atto: add macrons to atto charmap 2015-01-21 01:12:22 +08:00
Eloy Lafuente (stronk7)
e08f58288a Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:07:34 +01:00
Eloy Lafuente (stronk7)
782ea98c59 Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle 2015-01-20 16:14:26 +01:00
Andrew Nicols
de049d9d26 Merge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle 2015-01-20 15:42:11 +08:00
Andrew Nicols
e50bac7ac1 Merge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle 2015-01-20 14:00:41 +08:00
Rajesh Taneja
e41aa29bca MDL-48624 behat: Added extended timeout to ensure step pass
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-19 10:15:47 +08:00
Vadim Dvorovenko
f64828f23a MDL-48798 Statistics: Adding lang string for user activity.
New lang string for 'Activity' (meaning count of user actions) in stats
reports to disambiguate it with 'Activity' (meaning course module).

AMOS BEGIN
 CPY [activity,core],[useractivity,core]
AMOS END
2015-01-16 09:30:24 +07:00
Vadim Dvorovenko
2fbd261d45 MDL-42172 Authentification: Adding alternate names to "Lock user fields"
Adding alternate name fields (firstnamephonetic, lastnamephonetic,
middlename, alternatename) to "Lock user fields" for all
authentification plugins. This is needed to sync alternate name fields
with external data sources and to lock them for editing.
2015-01-16 09:23:51 +07:00
Eloy Lafuente (stronk7)
4f6c2d9f8b MDL-48741 behat: add new moodle_list formatter (rerun compatible) 2015-01-16 03:13:58 +01:00
Michael Aherne
c3acc77965 MDL-48830 accesslib: Add sort field to query 2015-01-15 10:12:23 +00:00
Eloy Lafuente (stronk7)
6f1c51b61a Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle 2015-01-15 08:35:00 +00:00
Dan Poltawski
98c6b90358 Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle 2015-01-15 08:32:41 +00:00
Ankit Agarwal
c93e6c5c17 MDL-48510 inbound: use 0 expiration for private files handler 2015-01-15 08:32:40 +00:00
Ankit Agarwal
017de890cb MDL-48510 inbound: Support disabling of expiration changes in UI 2015-01-15 08:32:40 +00:00
Ankit Agarwal
0a4ce3ffb4 MDL-48510 inbound: Use correct value of expiration 2015-01-15 08:32:39 +00:00
Eloy Lafuente (stronk7)
5d98ba68f5 MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests
MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.

This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.

So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.
2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
933c8f6a25 Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:32:37 +00:00
Dan Poltawski
3eda28e937 Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle 2015-01-15 08:32:34 +00:00
Patrik Granlöv
06844353e5 MDL-35486 outputlib: Fix typos in comments
Just a copy-past text error in two comments.
2015-01-14 10:53:25 +00:00