mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 07:22:39 +02:00
Code Issues Projects Releases Wiki Activity
72,387 Commits 36 Branches 528 Tags
Commit Graph

1230 Commits

Author SHA1 Message Date
Andrew Nicols
4ec9e2a613 Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle" 
This reverts commit 7a5d394e3c3e0fab8200d0867f6974d9c583d6e4, reversing
changes made to 58d5cc53604aa4181adc1cddc39114f40673a2a3.
 2015-02-19 08:55:22 +08:00
Eloy Lafuente (stronk7)
7a5d394e3c Merge branch 'MDL-49154' of git://github.com/timhunt/moodle 2015-02-17 23:44:43 +01:00
Eloy Lafuente (stronk7)
b062cd5cb1 Merge branch 'MDL-49205' of git://github.com/timhunt/moodle 2015-02-17 22:11:57 +01:00
Eloy Lafuente (stronk7)
d1b94e5437 Merge branch 'MDL-49059-split' of https://github.com/pauln/moodle 2015-02-17 20:56:45 +01:00
Ankit Agarwal
bbcd308340 MDL-48559 behat: Moving cronclionly to the installer 2015-02-17 14:33:56 +08:00
David Monllao
a27b8c9b3b Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle 2015-02-16 16:51:51 +08:00
David Monllao
470e087d80 Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle 2015-02-16 11:52:50 +08:00
Tim Hunt
f0edd9d8f6 MDL-49205 behat: fix I set the field with xpath fail message. 2015-02-13 16:15:49 +00:00
Paul Nicholls
408a41bd35 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:45:41 +13:00
Paul Nicholls
b600abe20f 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:43:43 +13:00
Paul Nicholls
8050cfe0b7 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:43:05 +13:00
Tim Hunt
2116de5f80 MDL-49154 behat: step to type with focus on a given element 2015-02-12 20:14:50 +00:00
Frederic Massart
0af336ef93 MDL-47529 task: Do not use lock when updating task records 2015-02-12 11:16:20 +08:00
Jetha Chan
3451a51cdf MDL-37477 output: Add support for table captions 
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
 2015-02-10 16:15:49 +08:00
David Monllao
f01845c2a6 Merge branch 'MDL-48212-master' of git://github.com/ankitagarwal/moodle 2015-02-10 08:54:13 +08:00
Ankit Agarwal
1ae85f2184 MDL-48559 Behat: Enable web cron by default in behat tests 2015-02-09 12:48:30 +05:30
Dan Poltawski
80f8372926 Revert "Merge branch 'MDL-37477-master' of git://github.com/jethac/moodle" 
This reverts commit f13e8ad04168574574d5be2995502d849109d3f9, reversing
changes made to c6bcbad07a7fd437991ee7a2a1a98973949fac43.
 2015-02-05 08:07:29 +00:00
Dan Poltawski
8448af7d86 Merge branch 'behat_goutte_nowait' of https://github.com/tlevi/moodle 2015-02-03 13:08:32 +00:00
Dan Poltawski
cb4748b67d Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-02-03 11:01:05 +00:00
Andrew Nicols
70b7861da2 Merge branch 'tgz_fixing' of https://github.com/tlevi/moodle 2015-02-03 16:02:59 +08:00
Jetha Chan
49faeef6bb MDL-37477 output: Add support for table captions 2015-02-03 13:38:24 +08:00
Rajesh Taneja
c3b72e586a 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:54:12 +08:00
Tony Levi
0021942592 MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups 2015-01-29 22:53:20 +10:30
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
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
Rajesh Taneja
20153f6308 MDL-48926 behat: No expand form required in non-js mode 2015-01-28 10:58:01 +10:30
Eloy Lafuente (stronk7)
215c37097e Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle 2015-01-28 00:36:14 +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
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
Ankit Agarwal
93975a6afc MDL-48212 messages: Add unit tests for the message class 2015-01-26 08:16:03 +05:30
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
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
Jetha Chan
c589b7be4e MDL-48542 user_menu: add custom user menu unit test 2015-01-19 23:58:10 +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
Frederic Massart
d2fdad7c6c MDL-43679 core: Handle Meridio user agents with MS Word 2015-01-02 11:22:47 +08:00
Paul Nicholls
21ece8eebc MDL-43679 core_useragent: add test cases for MS Word 
The new is_msword() check should always return false for regular browsers.
It should return true for known MS Word, but false for known MS Outlook.
 2015-01-02 10:54:52 +08:00
Dan Poltawski
9835839186 Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle 2014-12-23 10:20:44 +00:00
Dan Poltawski
e04cf8d83f MDL-48653 behat: fix incorrect phpdoc 2014-12-22 13:12:48 +00:00
Dan Poltawski
6a96178bc0 Merge branch 'MDL-48653' of git://github.com/timhunt/moodle 2014-12-22 13:10:44 +00:00
Dan Poltawski
c67c00a6fe Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle 2014-12-22 12:13:31 +00:00
sam marshall
91fed57a4e MDL-42616 filelib: Use config value for custom MIME types (1/2) 
Uses a new optional config variable to define custom MIME types
in JSON format. Includes new API for accessing and modifying
this data.
 2014-12-19 14:48:59 +00:00
Tim Hunt
20dd5a7a7a MDL-48653 behat: Steps to click and dismiss a dialogue. 
We already had the corresponding
    I click on "Home" "link" confirming the dialogue
but I needed the opposite
    I click on "Home" "link" dismissing the dialogue
 2014-12-18 19:29:29 +00:00
Dan Poltawski
344b4b9846 Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle 2014-12-17 10:11:40 +00:00
BKelada
8ce30abf5b MDL-44829 libraries: Update android user agent detection 2014-12-17 16:10:24 +11:00