Commit Graph

19184 Commits

Author SHA1 Message Date
Andrew Nicols 3a89cea7f7 MDL-49144 blocks: Sanitise alt and title for block controls 2015-03-02 12:09:58 +00:00
David Monllao 938d6e9def Merge branch 'MDL-48899-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE 2015-02-24 16:17:37 +08:00
Andrew Nicols bb323b1876 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:03:23 +08:00
Simey Lameze 817837bdd1 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:44:04 +08:00
Simey Lameze 1cf194adaa MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:41:05 +08:00
Andrew Nicols 86d20a95c8 Revert "Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE"
This reverts commit e0312ddb49, reversing
changes made to 636eb3726c.
2015-02-19 09:18:40 +08:00
Eloy Lafuente (stronk7) f423902be7 Merge branch 'MDL-48973_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE 2015-02-17 23:53:00 +01:00
Eloy Lafuente (stronk7) e0312ddb49 Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE 2015-02-17 23:47:13 +01:00
Eloy Lafuente (stronk7) 98e374b38f Merge branch 'MDL-49205_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE 2015-02-17 22:19:04 +01:00
Eloy Lafuente (stronk7) e9265276b8 Merge branch 'MDL-49059-split_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE 2015-02-17 20:59:03 +01:00
David Monllao e282453aea Merge branch 'MDL-49167-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE 2015-02-17 17:01:39 +08:00
Andrew Nicols 73d3d0d37f Merge branch 'wip-mdl-48670-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE 2015-02-17 14:06:45 +08:00
David Monllao 00ce45b9aa Merge branch 'MDL-47529-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE 2015-02-16 11:56:08 +08:00
Damyon Wiese 21929ef07d MDL-49167 YUI: Fix for theme/yui_combo.php and $CFG->yuislashargs
It was too aggressively cleaning it's params (broken in MDL-48980).
2015-02-16 11:26:57 +08:00
Frederic Massart 27548ec845 MDL-47529 task: Remove usage of lock when editing a task 2015-02-16 11:14:05 +08:00
Frederic Massart c33fdb5834 MDL-47529 task: Do not use lock when updating task records 2015-02-16 11:14:05 +08:00
Tim Hunt 2a7241b3a1 MDL-49205 behat: fix I set the field with xpath fail message. 2015-02-13 16:16:27 +00:00
Paul Nicholls 5e5b5b393d MDL-48973 Atto: Atto does not listen to the drop event
The 'drop' event fires before the native ContentEditable drop handler, so
in order to update the underlying textarea we need to call updateOriginal
with a brief delay so that the dropped content has actually been added to
the editor.
2015-02-13 14:51:24 +13:00
Rajesh Taneja 5fe6298a05 MDL-48670 behat: Set timezone to Australia/perth
Behat tests might rely on time related tests
Ensure we have default timezone set to Australia/Perth
2015-02-13 08:13:41 +08:00
Paul Nicholls f65b1f10ad MDL-49059 medialib: Add test cases for invalid Youtube URL param values
Tests to ensure that we're not allowing injection via invalid values of
the Youtube start time and playlist parameters.
2015-02-13 09:49:16 +13:00
Paul Nicholls a16e03df3f MDL-49059 medialib: Support links to Youtube videos within playlists
As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  Previously, just the
specified video would embed - without the playlist UI.
2015-02-13 09:49:16 +13:00
Paul Nicholls b516be1d7e MDL-49059 medialib: Support start time params in Youtube URLs
Medialib (and thus the Multimedia Plugins filter) was ignoring start time
parameters on YouTube video URLs, meaning that the video would always
start at the start, even when the appropriate parameter was present.
2015-02-13 09:49:16 +13:00
Paul Nicholls 85a61d783e MDL-49059 medialib: Add tests for Youtube videos within playlists
As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist.  These URLs should be covered
by the tests to ensure that we're handling them properly.
2015-02-13 09:49:15 +13:00
Paul Nicholls 48b7540b31 MDL-49059 medialib: Add test cases for Youtube start times
Add test cases to core_medialib_testcase to cover YouTube videos with
start times.
2015-02-13 09:49:15 +13:00
Tim Hunt 3d3b2669c9 MDL-49154 behat: step to type with focus on a given element 2015-02-12 20:15:52 +00:00
Dan Poltawski d612b63001 Merge branch 'wip-mdl-49081-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE 2015-02-10 09:18:00 +00:00
David Monllao 9c95bd6d03 Merge branch 'MDL-48960-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE 2015-02-10 11:12:45 +08:00
Eloy Lafuente (stronk7) 0370128f35 Merge branch 'MDL-49073-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE 2015-02-10 01:07:45 +01:00
Dan Poltawski 00e8070f00 Merge branch 'MDL-48544-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE 2015-02-09 22:42:15 +00:00
Andrew Nicols 8bc846ff7a MDL-48544 blocks: Only add docked tags if all blocks are docked
Previously, if all blocks were hidden, then the region was reported as
being docked eroniously and it was not possible to unhide the blocks.

Docking should have no relation to the presence of block content.
2015-02-09 20:56:04 +08:00
Dan Poltawski 4f0874c0cf Merge branch 'MDL-44520-27' of git://github.com/xow/moodle into MOODLE_27_STABLE 2015-02-09 11:33:16 +00:00
Dan Poltawski 19e7fb0ca0 Merge branch 'MDL-48294-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE 2015-02-09 11:28:22 +00:00
Yuliya Bozhko 4582c3d4fa MDL-47085 badges: Fix badges file download issues
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-02-09 16:01:51 +13:00
John Okely d025f8a226 MDL-44520 behat: Add behat selectors for section, activity 2015-02-06 10:35:05 +08:00
Dan Poltawski 232a79c81c MDL-48960 output: use nofollow attribute to stop crawling invalid links
Both the calendar set url and switch theme links are displayed to
non-logged in users which mean they get crawled by search bots. This
prevents the search bots following these links.
2015-02-05 08:14:14 +00:00
Juan Leyva af5f6b7300 MDL-48294 settings: enablemobilewebservice appears twice 2015-02-04 10:26:49 +01:00
Jetha Chan 3ba01c11b4 MDL-49073 timezones: update to 2015a (2323 rules) 2015-02-04 13:19:16 +08:00
Rajesh Taneja 0402c8c069 MDL-49081 tests: Removed dev option from composer
dev option is enabled by default in composer, so not required.
https://github.com/composer/composer/blob/master/CHANGELOG.md
2015-02-04 10:21:38 +08:00
Dan Poltawski a84ea4944a Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE 2015-02-03 11:01:58 +00:00
Neill Magill a2b22dd5df MDL-48865 core_block: Show regions with only hidden blocks when editing
Before this patch if all the blocks in a block region are set to hidden the region will be docked even when editing is enabled.
This meant that as a user I would need to add a new block to the page and move it to that region via the configuration
menu before I could manipulate the hidden blocks again.
2015-02-03 16:14:42 +08:00
Andrew Nicols 4d70a24d32 Merge branch 'tgz_fixing27' of https://github.com/tlevi/moodle into MOODLE_27_STABLE 2015-02-03 16:04:30 +08:00
Andrew Nicols 5c5559abb8 Merge branch '48968-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE 2015-02-03 14:25:15 +08:00
Andrew Nicols 8d3e6e385d MDL-48484 admin: Improve coding style 2015-02-03 13:44:47 +08:00
Andrew Nicols 1030084f6e Merge branch 'm27_MDL-48484' of https://github.com/totara/moodle into MOODLE_27_STABLE 2015-02-03 13:44:21 +08:00
Andrew Nicols 7f866e3c18 Merge branch 'm27_MDL-46467' of https://github.com/totara/moodle into MOODLE_27_STABLE 2015-02-03 12:59:46 +08:00
Brian Barnes 51f931fea7 MDL-48484 admin: Added labels to configtime settings 2015-02-02 16:46:33 +13:00
Andrew Nicols 40c809b83e MDL-48899 lib: Use the wwwroot to inform the message-ID
PHPMailer can sometimes fail to get a valid hostname when trying to
determine a Message-ID.

Rather than relying entirely on the serverHostname, fall back on the
wwwroot when unable to determine the real hostname.
2015-01-30 11:01:11 +08:00
Rajesh Taneja b6fcba4636 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-30 08:55:54 +08:00
Tony Levi edcb9e619f MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups 2015-01-29 22:53:01 +10:30
Damyon Wiese 0289be1321 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:01 +08:00