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

19585 Commits

Author SHA1 Message Date
Simon Coggins
e53364b62f MDL-35155: Fix MSSQL bug in sql_substr() 2014-12-31 15:14:58 +00: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
9835839186 Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle 2014-12-23 10:20:44 +00: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
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
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
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
David Monllao
92f5468179 Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle 2014-12-17 08:52:58 +08:00
Brian Barnes
60b57b6189 MDL-48482 core_admin: Added additional label for durations 2014-12-17 08:54:55 +13:00
Dan Poltawski
f5360dd16b Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle 2014-12-16 18:52:40 +00:00
Dan Poltawski
4b0c38daee Merge branch '38663-29' of git://github.com/samhemelryk/moodle 2014-12-16 18:45:33 +00:00
Dan Poltawski
aaca4e3eff Merge branch 'MDL-48587-master' of git://github.com/xow/moodle 2014-12-16 17:05:03 +00:00
Eloy Lafuente (stronk7)
8b25d8d70c Merge branch '34041-29' of git://github.com/samhemelryk/moodle 2014-12-16 16:35:47 +01:00
Dan Poltawski
eb7ab07ef8 Merge branch 'MDL-44985-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:44:22 +00:00
Eloy Lafuente (stronk7)
3bd434cd49 Merge branch 'MDL-34550-master' of git://github.com/ankitagarwal/moodle 2014-12-16 13:35:52 +01:00
Dan Poltawski
4c4507d6dc Merge branch 'MDL-42862-master' of git://github.com/ankitagarwal/moodle 2014-12-16 12:22:37 +00:00
Dan Poltawski
52a7001bc2 Merge branch 'MDL-44088-master' of git://github.com/andrewnicols/moodle 2014-12-16 11:20:29 +00:00
Dan Poltawski
a3cc7bd8ce Merge branch 'MDL-44918-master' of git://github.com/FMCorz/moodle 2014-12-16 11:20:04 +00:00
Dan Poltawski
524cbf743a Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle 2014-12-16 10:44:16 +00:00
Frederic Massart
38a73bf4ae MDL-48495 curl: Limit usage of curl to HTTP and HTTPS protocols 2014-12-16 10:08:33 +00:00
John Okely
e6904efc52 MDL-42166 repositories: Finalise deprecation of repository sync methods 2014-12-16 15:57:50 +08:00
David Monllao
32759f7f7e Merge branch 'MDL-48547-master' of git://github.com/danpoltawski/moodle 2014-12-16 14:14:24 +08:00
David Monllao
d0f3b7e685 Merge branch 'MDL-44642-master-fixes' of git://github.com/andrewnicols/moodle 2014-12-16 11:43:21 +08:00
Andrew Nicols
8fab443931 Merge branch 'MDL-46472_master' of git://github.com/dmonllao/moodle 2014-12-16 10:35:48 +08:00
Andrew Nicols
f9b431b873 MDL-44642 session: Remove 403 from require_sesskey() 
This should not have been added in core at this time (needs a separate
issue).
 2014-12-16 10:18:21 +08:00
Andrew Nicols
57996fe956 MDL-44642 session: Add a client-side session keepalive system 
For pages where there will be significant user interaction in which the
server is not updated, it may be necessary to poll the server periodically
to touch the session.

This makes use of the existing checknet script which was designed for
checking network connectivity but fits into this use-case reasonably well.
 2014-12-16 08:32:46 +08:00
Frederic Massart
6b61c2c45f MDL-46124 libraries: Final deprecation of text libs and plugin libs 
- textlib_get_instance
- textlib
- collatorlib
- plugin_manager
- plugininfo_base
 2014-12-15 17:02:31 +08:00