Dan Poltawski
4aa5e355e6
MDL-51078 report_log: use simpler/faster str_split over preg_split
2016-08-09 09:04:31 +01:00
Dan Poltawski
4d31fc8444
Merge branch 'MDL-51078_m32v3' of https://github.com/sbourget/moodle
2016-08-09 08:57:09 +01:00
Dan Poltawski
05a9c36edc
Merge branch 'MDL-54862-master' of git://github.com/dpalou/moodle
2016-08-09 08:06:35 +01:00
Andrew Nicols
5fa90114d7
MDL-55329 behat: Correct typo
2016-08-09 14:41:22 +08:00
Andrew Nicols
8173c3ef7f
Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle
2016-08-09 14:26:09 +08:00
Rajesh Taneja
e259795c4f
MDL-55329 behat: PyStrings should end with : (colon)
2016-08-09 14:22:21 +08:00
Andrew Nicols
f1c6194f3d
Merge branch 'MDL-55480-master' of git://github.com/FMCorz/moodle
2016-08-09 13:50:55 +08:00
Andrew Nicols
46c31069f3
MDL-55390 core_search: Correct variable name
2016-08-09 13:44:10 +08:00
Andrew Nicols
aaf8d55a27
Merge branch 'MDL-55390' of https://github.com/dg711/moodle
2016-08-09 13:42:32 +08:00
Andrew Nicols
6c19db54f9
Merge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle
2016-08-09 12:52:13 +08:00
Andrew Nicols
19491e68fe
MDL-41126 mod_data: Add type hinting
2016-08-09 12:49:01 +08:00
Andrew Nicols
d5bd76f4e5
MDL-41126 mod_data: Styling fixes
2016-08-09 12:49:01 +08:00
Andrew Nicols
20195fb46a
Merge branch 'wip-mdl-41126' of https://github.com/rajeshtaneja/moodle
2016-08-09 12:47:35 +08:00
Andrew Nicols
95a556c50a
Merge branch 'MDL-55465-master' of git://github.com/danpoltawski/moodle
2016-08-09 12:31:46 +08:00
Andrew Nicols
a5aa1b6b00
Merge branch 'MDL-53016-master' of https://github.com/xow/moodle
2016-08-09 11:41:09 +08:00
Rajesh Taneja
9f2b916dee
MDL_41126 phpunit: Timestamp should be less than 2038
...
http://php.net/manual/en/datetime.gettimestamp.php#114590
In 32-bit system the unix timestamp will overflow if the date goes beyond year 2038
and this method will return false.
2016-08-09 10:50:07 +08:00
Andrew Nicols
675345475d
MDL-55274 mod_chat: Add unit tests for special commands
2016-08-09 10:44:08 +08:00
Andrew Nicols
fe88f065b7
Merge branch 'MDL-55274-master' of git://github.com/lameze/moodle
2016-08-09 09:05:09 +08:00
Dan Poltawski
763c5b0eb4
Merge branch 'MDL-48856' of https://github.com/mr-russ/moodle
2016-08-08 14:45:06 +01:00
Dan Poltawski
741bd4dfb7
Merge branch 'MDL-55061' of https://github.com/zanekarl17/moodle
2016-08-08 14:33:08 +01:00
Dan Poltawski
49924b335e
Merge branch 'MDL-55398_m32v1' of https://github.com/sbourget/moodle
2016-08-08 10:40:42 +01:00
Dan Poltawski
0c4ccf73d9
Merge branch 'wip-MDL-55418-master' of https://github.com/marinaglancy/moodle
2016-08-08 10:33:46 +01:00
Dan Poltawski
1194324e80
Merge branch 'MDL-55453-master' of https://github.com/mrmark/moodle
2016-08-08 09:53:22 +01:00
Andrew Nicols
27a94d591d
Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle
2016-08-08 15:25:45 +08:00
Andrew Nicols
be97f38188
Merge branch 'MDL-3782_multichoice_multiple' of git://github.com/davosmith/moodle
2016-08-08 14:04:53 +08:00
Andrew Nicols
6ab25fa0b2
Merge branch 'MDL-41126' of git://github.com/dg711/moodle
2016-08-08 13:24:25 +08:00
Nick Phillips
376be6ae86
MDL-55274 mod_chat: regain beep and / command in mod_chat.
...
format_text cannot be called on the whole input text, but must be
called on user-supplied text that will be output into chats. This
means it cannot simply be called in one place, but must instead be
called on the relevant parts of text once commands have been matched.
2016-08-08 12:30:33 +08:00
fhuebler
269bcf7e97
MDL-55480 competency: Added missing closing tag
2016-08-08 11:00:22 +08:00
Andrew Nicols
e6ab38f3ca
Merge branch 'MDL-55454' of git://github.com/timhunt/moodle
2016-08-08 10:00:30 +08:00
Dan Poltawski
70db37ba78
MDL-55465 grunt: ensure gruntfile is lint free
...
Not related to this patch, but fixed it while I was here..
2016-08-05 17:48:24 +01:00
Dan Poltawski
a26d36738a
MDL-55465 grunt: Add .stylelintignore
...
Allow it to be generated by grunt ignorefiles
Make grunt use it rather than ignoring things manually
2016-08-05 17:48:24 +01:00
John Okely
64f631c128
MDL-53016 classloader: Load PSR-0 and PSR-4 separately, add unit tests
2016-08-05 10:11:52 +08:00
Dan Poltawski
91c07d06af
MDL-53016 classloader: Load PSR-0 and PSR-4 namespaces dynamically
2016-08-05 10:11:52 +08:00
Devang Gaur
400eb2d0e5
MDL-41126 mod_data: added field and entry generator
2016-08-05 04:08:50 +05:30
Devang Gaur
396d6f0a6e
MDL-55390 core_search: check if a search area is real
2016-08-05 01:12:21 +05:30
Zane Karl
6db3b6d6a6
MDL-55061 Grade_Export: Grade Export Logging
2016-08-04 11:57:51 -07:00
Russell Smith
bdca62ac6d
MDL-55292 performance: Allow Tideways profiler extension.
...
PHP7 doesn't have any default XHProf support and all other
investigated forks don't have stable PHP7. Tideways is under
active development and is easy to install. The data format
is compatible with XHProf so it is a drop-in replacement in that way.
2016-08-04 21:10:03 +10:00
Andrew Nicols
7752762674
weekly release 3.2dev
2016-08-04 09:58:40 +08:00
Andrew Nicols
30c7ec63df
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-08-04 09:58:34 +08:00
Rajesh Taneja
99ad3223a5
MDL-54656 behat: Skip test if db family is not mysql or postgres
2016-08-04 08:46:04 +08:00
Tim Hunt
0e9132e56e
MDL-55454 quiz: loses shufflequestion setting restoring old backups
2016-08-03 18:42:51 +01:00
Mark Nielsen
d900d61798
MDL-55453 core_lib: Fix usage of js_send_uncached
2016-08-03 10:18:41 -07:00
Davo Smith
946ab15c72
MDL-3782 qtype_multianswer: support 'multiple-answer' subquestions
2016-08-03 08:04:49 +01:00
Andrew Nicols
d21942998c
Merge branch 'MDL-55367-master-fix' of https://github.com/lameze/moodle
2016-08-03 14:41:47 +08:00
Andrew Nicols
0731226023
Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle
2016-08-03 14:35:08 +08:00
Andrew Nicols
1a354b81b6
MDL-54941 glossary: Correct variable naming for entry files
2016-08-03 14:33:53 +08:00
Simey Lameze
e3df6df02e
MDL-55367 report_log: declare log array indexes to avoid errors
2016-08-03 14:23:44 +08:00
Andrew Nicols
079e06adcd
Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle
2016-08-03 10:45:15 +08:00
Simey Lameze
472ac2d390
MDL-55355 mod_feedback: Change show chart data step to avoid errors
2016-08-03 10:22:58 +08:00
Simey Lameze
14cc6df5f9
MDL-55355 core: Fix incorrect chart link selector
2016-08-03 10:21:48 +08:00