mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
71,707 Commits 36 Branches 527 Tags
Commit Graph

71707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
4aef356fd2 Merge branch 'MDL-46498_master' of https://github.com/markn86/moodle 2015-01-05 17:47:52 +00:00
Andrew Nicols
f06fc2b5c4 MDL-48104 mod_assign: Strip out use of eval() for string parsing 
I've also replaced other  occurrences of M.str with the correct use of
M.util.get_string() instead.
 2015-01-05 17:20:41 +00:00
Dan Poltawski
a2c5d58e93 Merge branch 'MDL-43679-master' of git://github.com/FMCorz/moodle 2015-01-05 15:49:23 +00:00
Simey Lameze
76aea854f6 MDL-48017 core_calendar: add context validation to get_calendar_events 2015-01-05 14:17:09 +00:00
Andrew Nicols
c84888c1cc MDL-48106 mod_glossary: Add missing sesskey checks 2015-01-05 13:37:54 +00:00
David Monllao
436bbf8975 MDL-48329 core_message: Checking that messaging system is enabled 2015-01-05 13:14:01 +00:00
Simey Lameze
82356399b9 MDL-48368 course: Add warning message to pending courses page 2015-01-05 12:58:33 +00:00
Simey Lameze
52ecd1de0a MDL-48368 course: fix xss on course request pending page 2015-01-05 12:58:33 +00:00
Jetha Chan
da4c33f510 MDL-47920 mod_lti: add capability checks, http headers 2015-01-05 12:48:09 +00:00
Andrew Nicols
e2b9458a7e Merge branch 'MDL-42519' of git://github.com/timhunt/moodle 2015-01-05 16:17:29 +08:00
Andrew Nicols
1f8cc2ed90 Merge branch 'MDL-48582-master' of git://github.com/merrill-oakland/moodle 2015-01-05 15:26:43 +08:00
Andrew Nicols
dd1adc419f Merge branch 'MDL-48644_restoreLegacyLogs' of https://github.com/moodlerooms/moodle 2015-01-05 14:30:56 +08:00
Andrew Nicols
ba5b6abe0e Merge branch 'MDL-48700-master' of git://github.com/merrill-oakland/moodle 2015-01-05 13:30:55 +08:00
Andrew Nicols
1abcc93e0b Merge branch 'MDL-43198-master' of git://github.com/danpoltawski/moodle 2015-01-05 13:22:09 +08:00
Andrew Nicols
0a149cf019 Merge branch 'MDL-46183-master' of git://github.com/FMCorz/moodle 2015-01-05 11:56:26 +08:00
Aaron Barnes
1151210154 MDL-40097 completion: Apply robust role detection to samesite restores. 2015-01-05 10:30:01 +08:00
Adrian Greeve
a43f43e2fa MDL-40097 completion: Update of code to meet guidlines. 2015-01-05 10:14:03 +08:00
Aaron Barnes
129e786cf4 MDL-40097 completion: Make restoring grade criteria more robust 2015-01-05 10:14:03 +08:00
Frederic Massart
d2fdad7c6c MDL-43679 core: Handle Meridio user agents with MS Word 2015-01-02 11:22:47 +08:00
Frederic Massart
f63dec4bb2 MDL-43679 core: Never use HTTP redirect when the user agent is MS Word 2015-01-02 10:54:52 +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
Paul Nicholls
ff0e78e672 MDL-43679 core_useragent: add basic MS Word detection 
Basic detection for MS Word's internal link checker.  This is not perfect,
as older versions use IE6/7 user agent string with no identifying marks,
and newer versions don't necessarily identify themselves as Word (just as
Office).  Version information is not reliably available, even when there
is sufficient other information to identify it as Word's link checker.
This is also based on a small sample of Word / OS version pairings, so
there may be some which are identifiable but not currently covered.
 2015-01-02 10:54:52 +08:00
Mark Nielsen
7cd112dfd5 MDL-48644 backup tool_log: Fixing coding style 
Wrap long function definition
to next line.
 2014-12-29 10:55:09 -08:00
Dan Poltawski
136e05a7ff MDL-43198 folder: respect ignorefilesizelimits permission 
Thanks to Miryan Salas for the patch.
 2014-12-29 12:12:21 +00:00
Mark Nelson
d4aa23d09e MDL-46498 mod_assign: added behat tests 2014-12-26 17:48:06 -08:00
Dan Poltawski
eb1dc9fab9 weekly release 2.9dev 2014-12-24 13:22:20 +00:00
Dan Poltawski
28849926c5 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-12-24 13:22:18 +00:00
Mark Nelson
bd3ee80716 MDL-46498 mod_assign: display correct grading status 2014-12-23 23:46:22 -08:00
Eric Merrill
8e63ce4e02 MDL-48700 gradereport_history: Don't limit downloads by pages. 2014-12-23 16:11:02 -05:00
Dan Poltawski
71de4c9e0b Merge branch 'MDL-48213-master' of https://github.com/dthies/moodle 2014-12-23 16:13:25 +00:00
AMOS bot
e2eef9aff2 Automatically generated installer lang files 2014-12-24 00:04:13 +08:00
Eloy Lafuente (stronk7)
c0d8831ae7 MDL-45699 behat: Don't use behat/lib.php functions in core. 
behat/lib.php script should not be usually included, neither any of its functions
used within mooodle code at all. It's for exclusive use of behat and
moodle setup.php. For places requiring a different/special behavior
needing to check if are being run  as part of behat tests, use:
    if (defined('BEHAT_SITE_RUNNING')) { ...
 2014-12-23 12:29:44 +01:00
Dan Poltawski
cb878d027b Revert "Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle" 
This reverts commit b8572fa90435390fc18c2fe537403f7931d966aa, reversing
changes made to 172d7f16cecc7c666352086d40f4d5e84c714d32.
 2014-12-23 10:46:39 +00:00
Dan Poltawski
ffd95d4420 Revert "Merge branch 'patch-1' of https://github.com/jrchamp/moodle" 
This reverts commit d61ecfffe5a568bf1e6cb7684264272413ff5766, reversing
changes made to e04cf8d83fa0f392f9ce8ee50d94610b7073e73d.
 2014-12-23 10:42:47 +00: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
d890b55de1 Merge branch 'MDL-42616-master-fixup' of https://github.com/FMCorz/moodle 2014-12-23 09:51:31 +00:00
Frederic Massart
7f63c934a2 MDL-46183 theme_more: Background is seen through the activity chooser 2014-12-23 17:15:49 +08:00
Frederic Massart
ae46ca5fcc MDL-42616 core: Adding tool_filetypes to the standard plugins list 2014-12-23 12:04:02 +08:00
Eloy Lafuente (stronk7)
093c161d46 Merge branch '45699-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	cache/upgrade.txt
 2014-12-23 02:01:36 +01:00
Eloy Lafuente (stronk7)
57bd925603 MDL-48568 cache: make tests aware of default application store 
When an alternative cache configuration is used, aka:

define('TEST_CACHE_USING_ALT_CACHE_CONFIG_PATH', true);
$CFG->altcacheconfigpath = '/tmp/xxxxx.php';

the get_expected_application_cache_store() method was not able of
retroffiting the default application store being used.

This commit just implements that functionality so, when
executing unit tests using alternative configuration, assertions
looking for that will pass without a problem.
 2014-12-23 01:34:35 +01:00
Eloy Lafuente (stronk7)
88abb346a3 Merge branch '48568-29' of git://github.com/samhemelryk/moodle 2014-12-23 01:34:12 +01:00
Eloy Lafuente (stronk7)
2323289e2e Merge branch 'MDL-48593-master' of git://github.com/andrewnicols/moodle 2014-12-22 21:50:50 +01:00
Tim Hunt
46e4c35aa9 MDL-42519 qformat_xml: Correctly export questions containing ]]> 2014-12-22 19:46:23 +00:00
Eloy Lafuente (stronk7)
b44a858ff1 Merge branch 'MDL-48639' of git://github.com/timhunt/moodle 2014-12-22 19:09:43 +01:00
Dan Poltawski
a62de06e57 Merge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle 2014-12-22 17:29:43 +00:00
Dan Poltawski
1de86bf5b9 Merge branch 'MDL-25979_master' of https://github.com/crazyserver/moodle 2014-12-22 17:27:08 +00:00
Dan Poltawski
38da9a45e8 Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle 2014-12-22 17:00:19 +00:00
Dan Poltawski
f957ec61ca Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle 2014-12-22 16:34:48 +00:00
Dan Poltawski
affdc3b7e6 MDL-48638 course: update unit test to new message 2014-12-22 16:23:04 +00:00
Dan Poltawski
427f70a8d3 Merge branch 'MDL-42166-master' of git://github.com/xow/moodle 2014-12-22 15:38:49 +00:00