David Monllao
3d4837f915
Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle
2015-12-29 10:01:07 +08:00
AMOS bot
34ce176df2
Automatically generated installer lang files
2015-12-29 00:03:55 +08:00
AMOS bot
f041cbe690
Automatically generated installer lang files
2015-12-28 00:04:00 +08:00
AMOS bot
eba3c97445
Automatically generated installer lang files
2015-12-25 00:03:55 +08:00
Marina Glancy
a4269b45bc
MDL-52347 behat: fix random failures on fast computer
2015-12-24 14:14:58 +08:00
Rajesh Taneja
26b9181b1b
MDL-52606 behat: Added time delay to avoid random fails
...
If attempts are created at same timestamp, then results are
not same, and lesson module finds that attmpt was in progress.
To avoid this problem, attempts should be created at different
timestamp.
2015-12-24 14:00:17 +08:00
Dan Poltawski
afbb53d70b
weekly release 3.1dev
2015-12-23 11:35:50 +00:00
Dan Poltawski
711134ee20
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-12-23 11:35:46 +00:00
Dan Poltawski
c39cc37d5c
Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle
2015-12-23 11:29:01 +00:00
Mark Nelson
5d0aa9dcfe
MDL-52275 core: fixed grade-to-pass being overwritten
...
Thanks goes to W.J. Roes for the patch.
2015-12-23 14:31:53 +08:00
Andrew Nicols
6ec766069c
MDL-52597 mod_forum: Remove sleep from tests
2015-12-23 14:24:35 +08:00
Andrew Nicols
eb474609aa
MDL-52595 tests: Disable xdebug for travis runs
2015-12-23 13:14:37 +08:00
Andrew Nicols
2ece61e652
Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle
2015-12-23 10:04:51 +08:00
Jun Pataleta
db9be61f20
MDL-52355 mod_data: Added Gregorian hour and minute values
2015-12-23 09:53:12 +08:00
Shamim Rezaie
4210c83d3a
MDL-52355 mod_data: Make date field respect the calendar type in use
...
Updated the date subplugin to consider that the input date element
values might be for any calendar type and not just the Gregorian
calendar.
2015-12-23 09:53:11 +08:00
Shamim Rezaie
2c4bac4cd9
MDL-52354 select_time: Make select_time respect the set calendar type
...
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
2015-12-23 09:53:11 +08:00
Andrew Nicols
3dc5cdf543
Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle
2015-12-23 09:08:48 +08:00
Andrew Nicols
46c18e0dd2
MDL-52060 phpunit: Add tests for test_set_table_modified_by_sql
2015-12-23 09:08:06 +08:00
Eugene Venter
8ef4fbc64f
MDL-52530 unittest: more robust capability assignments for guest
...
for core_files_file_storage_testcase and core_repositorylib_testcase
2015-12-23 09:24:53 +13:00
Dan Poltawski
a07afffcce
MDL-52591 grunt: make shifter task respect --no-color
2015-12-22 18:37:27 +00:00
Eloy Lafuente (stronk7)
7814a99341
Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle
2015-12-22 17:14:38 +01:00
AMOS bot
008b95b248
Automatically generated installer lang files
2015-12-23 00:03:59 +08:00
Juan Leyva
2a72d9d237
MDL-52585 webservices: Return correct invalid login message
2015-12-22 16:59:24 +01:00
Juan Leyva
333e77703d
MDL-52586 webservices: Return the default user home page
2015-12-22 16:50:58 +01:00
Dan Poltawski
5dc7768f7e
Merge branch 'master_MDL-51916' of https://github.com/danmarsden/moodle
2015-12-22 13:17:54 +00:00
Dan Poltawski
29747350b1
Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle
2015-12-22 13:15:02 +00:00
M Kassaei
c398f6ed44
MDL-52365 qtype ddwtos & ddimageortext: 20 drag items IE11/Edge
2015-12-22 12:36:40 +00:00
Eloy Lafuente (stronk7)
c38bdd62c7
Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle
2015-12-22 13:07:01 +01:00
Dan Poltawski
3e0540b6ec
Merge branch 'wip-MDL-51239-master' of git://github.com/abgreeve/moodle
2015-12-22 11:58:28 +00:00
Dan Poltawski
40b6fbd4bf
Merge branch 'MDL-52556-master' of git://github.com/jleyva/moodle
2015-12-22 11:17:11 +00:00
Dan Poltawski
b687494f95
MDL-52017 enrol_self: fix incorrect empty statement
...
Ironically this was detected by causing a syntax error on php54
2015-12-22 09:48:56 +00:00
David Monllao
ab429bfa09
Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle
2015-12-22 16:36:29 +08:00
David Monllao
febc314895
Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
...
Conflicts:
version.php
2015-12-22 16:28:18 +08:00
David Monllao
a96bf448b8
Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
...
Conflicts:
version.php
2015-12-22 16:23:33 +08:00
Rajesh Taneja
e487a51db3
MDL-52060 phpunit: Keep track of modified database for reset
...
Keep list of modified tables, so they can be reset
without any guess work
2015-12-22 15:37:40 +08:00
Andrew Nicols
64f4889ad1
Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle
2015-12-22 15:13:38 +08:00
Andrew Nicols
9d926d1f27
Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle
2015-12-22 13:51:14 +08:00
Mark Nielsen
e61a9638f1
MDL-52060 phpunit: Improve get_message_processors reset
2015-12-22 13:40:39 +08:00
Mark Nielsen
d494306de7
MDL-52060 phpunit: Prevent querying database metadata
2015-12-22 13:40:38 +08:00
Rajesh Taneja
22d55b3950
MDL-52060 phpunit: Check file only if needed
2015-12-22 13:19:06 +08:00
Rajesh Taneja
44121fbdc9
MDL-52060 phpunit: Keep track of initial reset sequence
2015-12-22 13:19:06 +08:00
Andrew Nicols
ec68e9d530
Merge branch 'MDL-23128-master' of git://github.com/danpoltawski/moodle
2015-12-22 13:11:27 +08:00
Andrew Nicols
3390f40ab7
Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle
2015-12-22 12:33:57 +08:00
David Monllao
4b6b84d677
Merge branch 'wip-mdl-52376' of git://github.com/rajeshtaneja/moodle
2015-12-22 11:24:45 +08:00
David Monllao
39604f212e
Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle
2015-12-22 11:16:36 +08:00
Rajesh Taneja
c2df9b3b90
MDL-52427 behat: Fixed question selectors
...
As class is changed, we need to convert selector
to check if class is contained, rather then checking
selecting with specific class.
2015-12-22 10:43:22 +08:00
Stephen Bourget
bf5a27ce17
MDL-51445 Chat: Fix broken profile links
2015-12-21 20:37:54 -05:00
Andrew Nicols
8dccd20f76
Merge branch 'MDL-52334' of git://github.com/aolley/moodle
2015-12-22 08:45:30 +08:00
Dan Poltawski
bf47ce5050
Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle
2015-12-21 16:47:18 +00:00
Dan Poltawski
43fcd55e0c
Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle
2015-12-21 16:45:15 +00:00