Eloy Lafuente (stronk7)
b646a710ba
Merge branch 'MDL-43421' of git://github.com/mr-russ/moodle
2015-01-26 10:24:51 +01:00
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
David Monllao
59da38ef8a
Merge branch 'MDL-28513-master' of git://github.com/andrewnicols/moodle
2015-01-21 09:52:55 +08:00
Andrew Nicols
da992717f4
MDL-28513 install: Add adminemail to the CLI installers
2015-01-21 09:42:51 +08:00
Eloy Lafuente (stronk7)
2d78593650
Merge branch 'MDL-48830-m' of https://github.com/micaherne/moodle
2015-01-21 00:03:56 +01:00
Dan Poltawski
75a67b0650
Merge branch 'MDL-48798-29' of https://github.com/vadimonus/moodle
2015-01-20 17:50:19 +00:00
Eloy Lafuente (stronk7)
e08f58288a
Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle
2015-01-20 17:07:34 +01:00
Eloy Lafuente (stronk7)
782ea98c59
Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle
2015-01-20 16:14:26 +01:00
Andrew Nicols
de049d9d26
Merge branch 'MDL-42172-29' of https://github.com/vadimonus/moodle
2015-01-20 15:42:11 +08:00
Andrew Nicols
e50bac7ac1
Merge branch 'MDL-35486-master' of git://github.com/danpoltawski/moodle
2015-01-20 14:00:41 +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
Vadim Dvorovenko
f64828f23a
MDL-48798 Statistics: Adding lang string for user activity.
...
New lang string for 'Activity' (meaning count of user actions) in stats
reports to disambiguate it with 'Activity' (meaning course module).
AMOS BEGIN
CPY [activity,core],[useractivity,core]
AMOS END
2015-01-16 09:30:24 +07:00
Vadim Dvorovenko
2fbd261d45
MDL-42172 Authentification: Adding alternate names to "Lock user fields"
...
Adding alternate name fields (firstnamephonetic, lastnamephonetic,
middlename, alternatename) to "Lock user fields" for all
authentification plugins. This is needed to sync alternate name fields
with external data sources and to lock them for editing.
2015-01-16 09:23:51 +07:00
Eloy Lafuente (stronk7)
4f6c2d9f8b
MDL-48741 behat: add new moodle_list formatter (rerun compatible)
2015-01-16 03:13:58 +01:00
Michael Aherne
c3acc77965
MDL-48830 accesslib: Add sort field to query
2015-01-15 10:12:23 +00:00
Eloy Lafuente (stronk7)
6f1c51b61a
Merge branch 'MDL-48753_master' of git://github.com/markn86/moodle
2015-01-15 08:35:00 +00:00
Dan Poltawski
98c6b90358
Merge branch 'MDL-45848-master' of git://github.com/gurgus/moodle
2015-01-15 08:32:41 +00:00
Ankit Agarwal
c93e6c5c17
MDL-48510 inbound: use 0 expiration for private files handler
2015-01-15 08:32:40 +00:00
Ankit Agarwal
017de890cb
MDL-48510 inbound: Support disabling of expiration changes in UI
2015-01-15 08:32:40 +00:00
Ankit Agarwal
0a4ce3ffb4
MDL-48510 inbound: Use correct value of expiration
2015-01-15 08:32:39 +00:00
Eloy Lafuente (stronk7)
5d98ba68f5
MDL-35155 database: better sql_substr() impl. for mssql/sqlsrv + unit tests
...
MSSQL's substring() implementation is somehow silly/strict and unable to
perform implicit casts to integer both for the start and length parameters.
This hits Moodle badly because of another problems (MDL-23997) we decided
to cast to string all bound placeholders long ago.
So this commit just enforces the cast of the start and length parameters to
integer. And includes unit tests for using placeholders on all positions in
the sql_substr() method.
2015-01-15 08:32:38 +00:00
Eloy Lafuente (stronk7)
933c8f6a25
Merge branch 'MDL-35155-master' of git://github.com/danpoltawski/moodle
2015-01-15 08:32:37 +00:00
Dan Poltawski
3eda28e937
Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle
2015-01-15 08:32:34 +00:00
Patrik Granlöv
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
Dave Cooper
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
Dan Poltawski
b79dca85b7
Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle
2015-01-12 11:28:12 +00:00
Sam Hemelryk
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
Dave Cooper
369a63ac1c
MDL-47935 Atto: Moved atto notification message position
2015-01-09 15:53:19 +08:00
Andrew Nicols
455c8cdee6
MDL-47166 atto_indent: Swap Outdent and Indent
2015-01-09 09:21:13 +08:00
Frederic Massart
1920eebcaa
MDL-44907 admin: Better styling of admin settings validation errors
2015-01-08 14:14:38 +08:00
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
Russell Smith
1d293ca409
MDL-43421 logging: Ignore race condition in access update.
2015-01-03 20:40:12 +11: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
Dan Poltawski
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
Simon Coggins
e53364b62f
MDL-35155: Fix MSSQL bug in sql_substr()
2014-12-31 15:14:58 +00:00
