76443 Commits

Author SHA1 Message Date
Andrew Nicols
23079c2941 Merge branch 'MDL-49566_master' of git://github.com/markn86/moodle 2016-01-04 13:53:40 +08:00
Dan Poltawski
835ca0419b MDL-52552 course management: insufficient cleaning of search output 2016-01-04 10:13:58 +08:00
Andrew Nicols
aabb46e9ac Merge branch 'MDL-51445_m31v1' of https://github.com/sbourget/moodle 2016-01-04 09:20:31 +08:00
Dan Poltawski
ef343c3299 weekly release 3.1dev 2015-12-31 08:16:35 +00:00
Dan Poltawski
8af9cb76e2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-31 08:16:31 +00:00
David Monllao
d6024b8493 Merge branch 'MDL-52347_master-fix' of git://github.com/dmonllao/moodle 2015-12-31 13:20:40 +08:00
AMOS bot
b6336adb4b Automatically generated installer lang files 2015-12-31 00:03:52 +08:00
Dan Poltawski
53a2405c9c MDL-50357 groups: remove pointless option of groups_delete_group_members 2015-12-30 09:19:22 +00:00
Dan Poltawski
38c67d21e0 Merge branch 'MDL-50357_master' of git://github.com/markn86/moodle 2015-12-30 09:19:17 +00:00
David Monllao
19a1973a9a MDL-52347 format_social: Replicate wait between new discussions 2015-12-30 14:47:45 +08:00
Mark Nelson
04503c5cde MDL-50357 core_group: tidy up the function groups_delete_group_members 2015-12-30 09:27:05 +08:00
AMOS bot
0fd0e88127 Automatically generated installer lang files 2015-12-30 00:03:54 +08:00
Juan Leyva
1a5f7e4cad MDL-50428 mod_scorm: Fix tests for mod_scorm_launch_sco 2015-12-29 16:36:39 +01:00
Michael Aherne
f6b4fe38a9 MDL-52439 assign: correct get_user_submission() phpdoc 2015-12-29 10:37:14 +00:00
Dan Poltawski
a3f238a120 Merge branch 'MDL-52275_master' of git://github.com/markn86/moodle 2015-12-29 10:04:42 +00:00
Mark Nelson
be5e0110ff MDL-49566 core: used reflection in unit tests
Also split the tests into multiple functions for each scenario.
2015-12-29 17:42:43 +08:00
David Monllao
b29c013309 Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle 2015-12-29 15:35:15 +08:00
David Monllao
1c042d38ea Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes 2015-12-29 14:05:42 +08:00
David Monllao
c7d394676e Merge branch 'wip-mdl-52347' of git://github.com/rajeshtaneja/moodle 2015-12-29 14:03:10 +08:00
David Monllao
d077c6a4ba Merge branch 'MDL-52591-master' of git://github.com/danpoltawski/moodle 2015-12-29 13:47:06 +08:00
Mark Nelson
be6fb6b1a6 MDL-51889 enrol_guest: always check password before re-enabling 2015-12-29 13:42:39 +08:00
Ankit Agarwal
bef0d6b052 MDL-49566 core: Write unittests for MDL-45898 2015-12-29 11:22:42 +08:00
Ankit Agarwal
d955a20926 MDL-49566 myprofile: Fix bugs in myprofilelib 2015-12-29 11:22:42 +08:00
Ankit Agarwal
59eef1a174 MDL-49566 notes: Notes link should not show up for guests 2015-12-29 11:22:42 +08:00
David Monllao
97f4eb11a5 Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/scorm/version.php
	version.php
2015-12-29 10:46:52 +08:00
David Monllao
9787b9e02f MDL-52597 mod_forum: Remove duplicated query 2015-12-29 10:03:59 +08:00
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
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