3eda28e937
Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle
2015-01-15 08:32:34 +00:00
06844353e5
MDL-35486 outputlib: Fix typos in comments
...
Just a copy-past text error in two comments.
2015-01-14 10:53:25 +00:00
93023ceef4
MDL-45848 grading: Added ability to unset grades with advanced grading
...
Thanks to Mohamed Alsharaf for assistance on this patch
2015-01-13 09:19:11 +08:00
b79dca85b7
Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle
2015-01-12 11:28:12 +00:00
d237385e8a
MDL-48753 badges: converted func to named params
...
Converted the SQL params within badges_get_user_badges to
named params.
Unit tests added for this function at the same time.
UI covered by behat already.
2015-01-11 20:08:39 -08:00
369a63ac1c
MDL-47935 Atto: Moved atto notification message position
2015-01-09 15:53:19 +08:00
455c8cdee6
MDL-47166 atto_indent: Swap Outdent and Indent
2015-01-09 09:21:13 +08:00
1920eebcaa
MDL-44907 admin: Better styling of admin settings validation errors
2015-01-08 14:14:38 +08:00
2e02eab234
Merge branch 'MDL-43242-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/upgrade.txt
2015-01-08 01:30:53 +01:00
7d0d3b369d
MDL-43242 ajax: Final deprecation of core JS functions
2015-01-08 08:28:37 +08:00
d5fddbd333
Merge branch 'MDL-37584-master' of git://github.com/ankitagarwal/moodle
2015-01-08 00:45:09 +01:00
2ed7ca68d8
MDL-48688: inbound: remove spaces from exception
2015-01-07 11:12:21 +05:30
0d3e8ed4f6
Merge branch 'MDL-48080_master' of https://github.com/crazyserver/moodle
2015-01-07 10:52:04 +08:00
fcec67db13
Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle
2015-01-07 09:05:51 +08:00
ccc1782b69
Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle
2015-01-07 08:47:37 +08:00
b7f92c3845
Merge branch 'MDL-48442-master' of git://github.com/ankitagarwal/moodle
2015-01-06 11:19:20 +00:00
50808a9a32
Merge branch 'MDL-48655-master' of git://github.com/merrill-oakland/moodle
2015-01-06 11:09:41 +00:00
436d1a1787
Merge branch '28067-29' of git://github.com/samhemelryk/moodle
2015-01-06 10:52:31 +08:00
1d293ca409
MDL-43421 logging: Ignore race condition in access update.
2015-01-03 20:40:12 +11:00
4047cd751f
MDL-48442 tasks: Make sure first run is as per schedule
2015-01-02 14:53:50 +05:30
d2fdad7c6c
MDL-43679 core: Handle Meridio user agents with MS Word
2015-01-02 11:22:47 +08:00
f63dec4bb2
MDL-43679 core: Never use HTTP redirect when the user agent is MS Word
2015-01-02 10:54:52 +08:00
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
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
9581dff081
MDL-35155 dml: add unit test which exposes substr problem
...
Previously, when using parameters, substring broke on mssql.
2014-12-31 15:17:16 +00:00
e53364b62f
MDL-35155: Fix MSSQL bug in sql_substr()
2014-12-31 15:14:58 +00:00
db2d7de954
MDL-37584 tasks: Use a senisible maximum time window for the task
2014-12-31 14:01:27 +05:30
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
9835839186
Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle
2014-12-23 10:20:44 +00:00
9802bd616e
MDL-48697 libraries: Use proper path for core_completion
2014-12-23 13:29:58 +05:30
ae46ca5fcc
MDL-42616 core: Adding tool_filetypes to the standard plugins list
2014-12-23 12:04:02 +08:00
093c161d46
Merge branch '45699-29' of git://github.com/samhemelryk/moodle
...
Conflicts:
cache/upgrade.txt
2014-12-23 02:01:36 +01:00
38da9a45e8
Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle
2014-12-22 17:00:19 +00:00
427f70a8d3
Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
2014-12-22 15:38:49 +00:00
677172f722
Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle
2014-12-22 15:25:25 +00:00
7293a1aafd
MDL-44260 uplodate: move deprecated functions to deprecatedlib
2014-12-22 15:07:59 +00:00
65a19504d7
Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle
2014-12-22 14:57:30 +00:00
7f384c8f92
Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle
2014-12-22 14:36:46 +00:00
1f2789ebf2
Merge branch 'MDL-48224-master' of git://github.com/xow/moodle
2014-12-22 14:04:05 +00:00
172d7f16ce
Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle
2014-12-22 13:43:51 +00:00
e04cf8d83f
MDL-48653 behat: fix incorrect phpdoc
2014-12-22 13:12:48 +00:00
6a96178bc0
Merge branch 'MDL-48653' of git://github.com/timhunt/moodle
2014-12-22 13:10:44 +00:00
c67c00a6fe
Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle
2014-12-22 12:13:31 +00:00
90e30644d5
MDL-48080 email: Do not send to .invalid addresses. It is an invalid TLD
2014-12-22 10:41:58 +01:00
f1c4e3d2ba
MDL-48080 email: Remove some old error_log calls
2014-12-22 10:41:57 +01:00
6deca428d2
MDL-48688 inbound: Fix incorrect class names
2014-12-22 13:37:48 +05:30
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
649243260d
MDL-48483 admin: attached color label to input control
2014-12-19 14:26:18 +13:00
eb8b2425a6
MDL-48062 atto_image: Add image select on single click
2014-12-18 18:26:28 -06:00
6eb3da841d
MDL-48421 navigation: accounting for potential regression
2014-12-19 09:19:38 +11:00
Dan Poltawski