Andrew Nicols
f13e8ad041
Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle
2015-02-03 13:48:54 +08:00
Andrew Nicols
c6bcbad07a
MDL-48484 admin: Improve coding style
2015-02-03 13:40:30 +08:00
Jetha Chan
49faeef6bb
MDL-37477 output: Add support for table captions
2015-02-03 13:38:24 +08:00
Andrew Nicols
5dee60446c
Merge branch 'm29_MDL-48484' of https://github.com/totara/moodle
2015-02-03 13:04:38 +08:00
Andrew Nicols
43bde1b9fd
Merge branch 'm29_MDL-46467' of https://github.com/totara/moodle
2015-02-03 12:57:25 +08:00
Brian Barnes
e323bf512f
MDL-48484 admin: Added labels to configtime settings
2015-02-02 09:42:38 +13:00
Juan Leyva
d9a1cf5cae
MDL-48793 webservices: Deleted duplicated function in mobile service
2015-01-29 13:01:51 +01:00
Eloy Lafuente (stronk7)
c5c34b4019
Revert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle"
...
This reverts commit 73bf1119ddc19181f02fac81c7d7c3def9f5e28f, reversing
changes made to 7615deba22cfae9076a79fc8ce902b24815c1fff.
2015-01-28 21:13:42 +01:00
Eloy Lafuente (stronk7)
941ea6b2ff
Merge branch 'MDL-48898' of git://github.com/timhunt/moodle
2015-01-28 12:27:07 +01:00
Andrew Nicols
06c2753115
MDL-48542 user_menu: Handle invalid strings better
2015-01-28 15:39:15 +08:00
Damyon Wiese
af9a7937cc
MDL-48980 Security: Always clean the result from min_get_slash_argument
...
The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.
I also fixed the unit test for this function and added a new test for this cleaning.
I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.
2015-01-28 14:38:29 +08:00
Mark Nelson
6c85571902
MDL-48266 core: fixed backup upgrade
2015-01-27 21:32:07 -08:00
Andrew Nicols
ade0072379
MDL-48542 user_menu: Increment index for all menu items
...
The invalid type was not causing the idx to incremented, thus missing off
the final divider.
2015-01-28 12:09:23 +08:00
Andrew Nicols
8b7ca27d48
MDL-48542 user_menu: Improve user menu tests
...
Add additional test cases, and actually test that the output is roughly
what we expect.
2015-01-28 12:09:22 +08:00
Andrew Nicols
0977d3d404
Merge branch 'MDL-48542-master' of git://github.com/jethac/moodle
2015-01-28 12:02:28 +08:00
Stephen Bourget
5bc12ca265
MDl-47104 Calendar: Make 'calendar_lookahead' more flexible
2015-01-28 02:24:36 +01:00
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
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)
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
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
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