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,789 Commits 36 Branches 527 Tags
Commit Graph

19606 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2e02eab234 Merge branch 'MDL-43242-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/upgrade.txt
 2015-01-08 01:30:53 +01:00
Andrew Nicols
7d0d3b369d MDL-43242 ajax: Final deprecation of core JS functions 2015-01-08 08:28:37 +08:00
Eloy Lafuente (stronk7)
d5fddbd333 Merge branch 'MDL-37584-master' of git://github.com/ankitagarwal/moodle 2015-01-08 00:45:09 +01:00
Ankit Agarwal
2ed7ca68d8 MDL-48688: inbound: remove spaces from exception 2015-01-07 11:12:21 +05:30
Andrew Nicols
0d3e8ed4f6 Merge branch 'MDL-48080_master' of https://github.com/crazyserver/moodle 2015-01-07 10:52:04 +08:00
David Monllao
fcec67db13 Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle 2015-01-07 09:05:51 +08:00
David Monllao
ccc1782b69 Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle 2015-01-07 08:47:37 +08:00
Dan Poltawski
b7f92c3845 Merge branch 'MDL-48442-master' of git://github.com/ankitagarwal/moodle 2015-01-06 11:19:20 +00:00
Dan Poltawski
50808a9a32 Merge branch 'MDL-48655-master' of git://github.com/merrill-oakland/moodle 2015-01-06 11:09:41 +00:00
Andrew Nicols
436d1a1787 Merge branch '28067-29' of git://github.com/samhemelryk/moodle 2015-01-06 10:52:31 +08:00
Ankit Agarwal
4047cd751f MDL-48442 tasks: Make sure first run is as per schedule 2015-01-02 14:53:50 +05:30
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
Ankit Agarwal
db2d7de954 MDL-37584 tasks: Use a senisible maximum time window for the task 2014-12-31 14:01:27 +05:30
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
9835839186 Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle 2014-12-23 10:20:44 +00:00
Ankit Agarwal
9802bd616e MDL-48697 libraries: Use proper path for core_completion 2014-12-23 13:29:58 +05:30
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
Dan Poltawski
38da9a45e8 Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle 2014-12-22 17:00:19 +00:00
Dan Poltawski
427f70a8d3 Merge branch 'MDL-42166-master' of git://github.com/xow/moodle 2014-12-22 15:38:49 +00:00
Dan Poltawski
677172f722 Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle 2014-12-22 15:25:25 +00:00
Dan Poltawski
7293a1aafd MDL-44260 uplodate: move deprecated functions to deprecatedlib 2014-12-22 15:07:59 +00:00
Dan Poltawski
65a19504d7 Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle 2014-12-22 14:57:30 +00:00
Dan Poltawski
7f384c8f92 Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle 2014-12-22 14:36:46 +00:00
Dan Poltawski
1f2789ebf2 Merge branch 'MDL-48224-master' of git://github.com/xow/moodle 2014-12-22 14:04:05 +00:00
Dan Poltawski
172d7f16ce Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle 2014-12-22 13:43:51 +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
pau.ferrer-ocana
90e30644d5 MDL-48080 email: Do not send to .invalid addresses. It is an invalid TLD 2014-12-22 10:41:58 +01:00
pau.ferrer-ocana
f1c4e3d2ba MDL-48080 email: Remove some old error_log calls 2014-12-22 10:41:57 +01:00
Ankit Agarwal
6deca428d2 MDL-48688 inbound: Fix incorrect class names 2014-12-22 13:37:48 +05:30
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
Brian Barnes
649243260d MDL-48483 admin: attached color label to input control 2014-12-19 14:26:18 +13:00
Daniel Thies
eb8b2425a6 MDL-48062 atto_image: Add image select on single click 2014-12-18 18:26:28 -06:00
Tim Price
6eb3da841d MDL-48421 navigation: accounting for potential regression 2014-12-19 09:19:38 +11:00
Tim Price
85e59ac2f3 MDL-48421 navigation: correctly load child categories if parent is loaded 2014-12-19 09:19:38 +11:00
Eric Merrill
fdeda649e2 MDL-48655 gradebook: Don't treat a scale with a gradepass of 0 as passed 2014-12-18 16:17:52 -05: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
Eric Merrill
3f0023b995 MDL-48638 database SQL: Fix typo in exception constructor 2014-12-18 13:31:36 -05:00
Andrew Nicols
0e61dba339 MDL-38663 login: Remove login info from forgot password page 
Since this is checked in several locations, I have introduced a new
protected function to check whether the current page is a login page.

This could potentially be exposed as a public function, but Sam's original
comment suggests that this is undesirable.
 2014-12-18 11:58:26 +08:00
Dan Poltawski
344b4b9846 Merge branch 'MDL-44829_MOODLE_MASTER' of git://github.com/BenKelada/moodle 2014-12-17 10:11:40 +00:00
Eloy Lafuente (stronk7)
b033a93682 Merge branch 'MDL-46122-master' of git://github.com/FMCorz/moodle 2014-12-17 10:12:34 +01:00
Simey Lameze
6dd7175a20 MDL-44260 core_deprecated: final deprecation of clam related methods 2014-12-17 15:10:33 +08:00
Simey Lameze
1e23ff2122 MDL-44260 core_file: final deprecation of upload_manager class and clam functions 2014-12-17 15:10:13 +08:00
BKelada
8ce30abf5b MDL-44829 libraries: Update android user agent detection 2014-12-17 16:10:24 +11:00
Frederic Massart
c9bd4e41eb MDL-46122 libraries: Final deprecation of file lib/pluginlib.php 2014-12-17 09:37:11 +08:00