Commit graph

72310 commits

Author SHA1 Message Date
AMOS bot
45b6276ef6 Automatically generated installer lang files 2015-01-28 00:04:21 +08: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)
f271b113a6 Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle 2015-01-27 12:09:58 +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
sam marshall
6b40e5b2ec MDL-48660 Availability: filter_user_list() should respect 'view hidden'
Updated filter_user_list and get_user_list_sql to account for
the viewhiddenactivities and viewhiddensections capabilities.
2015-01-27 10:59:05 +00:00
Mark Nelson
d2e1c5f5fc MDL-40285 mod_assign: added extra group submissions behat scenario
Thanks a lot to Jody Steele for providing the basis for the scenario.
2015-01-27 00:36:49 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Ankit Agarwal
9e01886562 MDL-48559 reports: security report checks for web cron 2015-01-27 11:00:40 +05:30
Andrew Nicols
6d5381a38f Merge branch 'MDL-47871_master' of https://github.com/markn86/moodle 2015-01-27 13:09:29 +08:00
Ankit Agarwal
5254140b0c MDL-48559 cron: Disable web cron by default 2015-01-27 10:14:11 +05:30
Jerome Mouneyrac
09ca18a47e MDL-41026 webservices: use correct param format in external apis 2015-01-27 10:06:09 +05:30
Andrew Nicols
85099b388f MDL-46755 format_social: Minor corrections during integration
* Add additional checks in behat tests to ensure ordering of information
  does not give false positives
* Typo in lang pack
* Comment correction
2015-01-27 12:14:24 +08:00
Mark Nelson
bb286b6d5f MDL-47871 tool_monitor: allow teachers to duplicate site rules 2015-01-26 19:32:59 -08:00
Andrew Nicols
d927bc0f32 Merge branch 'MDL-46755_m29-2' of https://github.com/sbourget/moodle 2015-01-27 11:30:55 +08:00
Frederic Massart
517e0111f3 MDL-48920 tool_generator: Use 'real' names during course generation 2015-01-27 11:26:56 +08:00
Andrew Nicols
0d98b0f7ad Merge branch 'MDL-48491-master' of git://github.com/zbdd/moodle 2015-01-27 10:48:36 +08:00
David Monllao
58f2c3ca5c MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-01-27 10:43:29 +08:00
Brian Barnes
8b5f402151 MDL-46467 forms: Labels have "for" attribute even when frozen 2015-01-27 14:30:22 +13: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)
681b57bd28 Merge branch 'MDL-48921-master-2nd' of git://github.com/FMCorz/moodle 2015-01-27 01:02:39 +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)
65d2f8e3f9 Merge branch 'wip-MDL-48325-master' of git://github.com/abgreeve/moodle 2015-01-27 00:22:36 +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)
13abbea83b Merge branch 'MDL-48407-master' of git://github.com/gurgus/moodle 2015-01-26 23:41:17 +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)
2a5ecfa975 Merge branch 'MDL-48720-master' of git://github.com/andrewnicols/moodle 2015-01-26 19:08:21 +01:00
Eloy Lafuente (stronk7)
50b7b15894 Merge branch 'MDL-40286' of git://github.com/jmvedrine/moodle 2015-01-26 18:32:43 +01:00
Eloy Lafuente (stronk7)
59a99b02ee Merge branch 'MDL-35765-master' of git://github.com/merrill-oakland/moodle 2015-01-26 17:27:54 +01:00
Eloy Lafuente (stronk7)
6c1a89f1f3 Merge branch 'MDL-36877' of git://github.com/jmvedrine/moodle 2015-01-26 16:04:29 +01:00
Andrew Davis
64d45dafa1 MDL-48942 mod_survey: fixed coding style problems in mod/survey/view.php 2015-01-26 15:27:24 +01:00
Andrew Davis
9767d69680 MDL-48942 mod_survey: synced security checks in view.php and graph.php 2015-01-26 14:56:27 +01:00
Eloy Lafuente (stronk7)
ec96b4b3d9 Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle 2015-01-26 11:14:33 +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
Ankit Agarwal
9bb71899c0 MDL-48212 messages: show reply allowed message only when needed 2015-01-26 08:16:03 +05:30
Ankit Agarwal
93975a6afc MDL-48212 messages: Add unit tests for the message class 2015-01-26 08:16:03 +05:30
Ankit Agarwal
c6f45ef884 MDL-48212 messages: support the new class in message apis 2015-01-26 08:15:33 +05:30
Ankit Agarwal
53a842e6a9 MDL-48212 messages: Add a new class representing a message 2015-01-26 08:15:32 +05:30
Brian Barnes
c430c2c246 MDL-48805 theme: Collapse now collapses all data-target 2015-01-26 11:34:33 +13:00
Valerii Kuznetsov
13b5a4942f MDL-48968 blocks: fixed bug with pagetype handling 2015-01-26 09:28:42 +13:00
Jean-Michel Vedrine
ccf2a054ae MDL-36877 Lesson: final page not displayed if show gradebook set to no 2015-01-25 18:46:00 +01:00
Jean-Michel Vedrine
b69d512a90 MDL-40286 mod_lesson: non-editing teacher should see Grade analysis 2015-01-23 20:21:08 +01:00
Rod Norfor
2350e7f24d MDL-48914 admin: check maxuserperpage in existingroleholders->find_users 2015-01-23 16:02:27 +00:00
Tim Hunt
52540a51fa MDL-48898 quiz: use admin_setting_configduration
Now this setting type is available, it is a better UI.

This required a new setting class
admin_setting_configduration_with_advanced.

Also, I took the liberty of shortening the default auto-save delay to 1
minute, and re-wording the description of that setting, now that it can
be changed to any value.
2015-01-23 11:56:08 +00:00
Nelson Moller
413907cff3 MDL-48929 repository_filesystem: Valide relative path against realpath
On Windows systems, there could have been a mix of back and forward
slashes, causing the validation of the relative path to fail. Now
we will always get the realpath before comparing.
2015-01-23 17:26:32 +08:00