Eloy Lafuente (stronk7)
192bce5406
Merge branch 'MDL-36652' of https://github.com/rushi963/moodle
2016-03-01 22:01:44 +01:00
Eloy Lafuente (stronk7)
6770a4b3a2
Merge branch 'wip-mdl-53126' of https://github.com/rajeshtaneja/moodle
2016-03-01 21:35:03 +01:00
Eloy Lafuente (stronk7)
25a73245c0
Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
2016-03-01 21:23:16 +01:00
Rushikesh
f68d8a4151
MDL-49897 Calendar : Calendar day view showing past events
2016-03-01 20:05:51 +05:30
Dan Poltawski
73911de50d
MDL-50887 clam: upgrade step with wrong version
2016-03-01 21:37:56 +08:00
Rajesh Taneja
bdd4bed8b5
MDL-53300 core_grade: use currentgradetype if modgrade_type is not set
...
If mod has grades, then while upgrading
modgrade_type is disabled. This will not post
it with form and hence validation fails.
To avoid above problem, use ->currentgradetype
if modgrade_type is not set
2016-03-01 16:38:59 +08:00
Dan Poltawski
b8b7f33acd
Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
2016-03-01 14:56:58 +08:00
Dan Poltawski
2158e87492
Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle
2016-03-01 14:49:33 +08:00
Andrew Nicols
37f39924b5
Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle
2016-03-01 14:35:54 +08:00
Andrew Nicols
9557a603e6
Merge branch 'MDL-52397_fix-oracle' of git://github.com/dmonllao/moodle
2016-03-01 14:35:50 +08:00
Andrew Nicols
5d1a34b076
Merge branch 'MDL-48362-master-fix2' of http://github.com/damyon/moodle
2016-03-01 14:31:29 +08:00
David Monllao
2a03c5fe06
MDL-52397 mod_assign: Fix behat test
2016-03-01 14:29:27 +08:00
Damyon Wiese
74aece8719
MDL-48362 enrol_cohort: Fix unit test by manually triggering sync
...
Sync is now automatically triggered by add/update instance. We need
to manually trigger sync before each part of the test to clean up
role assignments from the previous test.
2016-03-01 14:25:48 +08:00
Andrew Nicols
21d43c12b9
MDL-50546 mod_quiz: Correct typos in WS docs
2016-03-01 14:22:06 +08:00
Andrew Nicols
614173c7dc
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
2016-03-01 13:41:35 +08:00
Mark Nelson
989a84577e
MDL-52489 mod_assign: mentioned changes in upgrade.txt
2016-03-01 13:19:02 +08:00
Dan Poltawski
6a9b3c5a48
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle
2016-03-01 13:10:57 +08:00
Dan Poltawski
340d35a902
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
2016-03-01 13:03:06 +08:00
Andrew Nicols
c62413ace3
Merge branch 'MDL-48362-master-fix1' of http://github.com/damyon/moodle
2016-03-01 12:58:54 +08:00
Dan Poltawski
71ea84048d
Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle
2016-03-01 12:53:10 +08:00
Dan Poltawski
de67ef599f
Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle
2016-03-01 12:38:54 +08:00
Dan Poltawski
b23f27fdd2
Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
2016-03-01 12:30:56 +08:00
David Monllao
4edd8e773d
MDL-52397 editpdf: Fix draft vs nondraft comparison
...
We can not rely on the db engine returning results in the same order
if no order is specified in get_comments and get_annotations.
Also fixing a related unit test.
2016-03-01 12:29:13 +08:00
Damyon Wiese
e3f24ac030
MDL-48362 enrol_cohort: Perform immediate sync on add/update instance
...
This restores backwards compatible behaviour.
2016-03-01 12:29:09 +08:00
Andrew Hancox
23b6636997
MDL-51687 mod_folder: Trigger event when downloading all files.
2016-03-01 12:27:55 +08:00
Dan Poltawski
792508cb7f
Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle
2016-03-01 12:26:33 +08:00
Dan Poltawski
fd8e293030
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle
2016-03-01 12:23:54 +08:00
Marina Glancy
17f53b45ab
MDL-44952 mod_feedback: set value for hidenoselect if disabled
2016-03-01 12:21:00 +08:00
Andrew Nicols
cf633c555e
MDL-30811 form: Remove continue from test.
2016-03-01 12:11:10 +08:00
Andrew Nicols
64d6465650
MDL-52974 mod_assign: Improve tests for view_submission_status
...
External tests only
2016-03-01 11:50:11 +08:00
Andrew Nicols
05b0f579ca
Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle
2016-03-01 11:48:16 +08:00
Dan Poltawski
c116a115d9
Merge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle
2016-03-01 11:34:04 +08:00
Dan Poltawski
d76acc87f7
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
2016-03-01 10:43:12 +08:00
Andrew Nicols
57ecaf68b8
Merge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle
2016-03-01 10:40:27 +08:00
Dan Poltawski
9f82928bb6
Merge branch 'MDL-53050-forum-target' of https://github.com/brendanheywood/moodle
2016-03-01 10:38:55 +08:00
Dan Poltawski
25c0e10122
Merge branch 'MDL-53072_master' of git://github.com/markn86/moodle
2016-03-01 10:12:46 +08:00
Andrew Nicols
c25f0b4d27
Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle
2016-03-01 10:05:53 +08:00
Andrew Nicols
2b38214a16
Merge branch 'MDL-53214-master' of git://github.com/cameron1729/moodle
2016-03-01 09:40:44 +08:00
Eloy Lafuente (stronk7)
d9dfc410ad
Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle
2016-03-01 01:59:31 +01:00
Andrew Nicols
80f79ad6ec
Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle
2016-03-01 08:07:56 +08:00
Ruslan Kabalin
324a45833a
MDL-50887 tests: Increment number of plugins in core_component_testcase.
...
We have got one more core plugin now.
2016-02-29 09:31:30 +00:00
Ruslan Kabalin
71f74dd165
MDL-50887 antivirus_clamav: Add unit tests for scanner class.
...
We are using "stubbing" method to replace real component (clamav) control
points with doubles in order to avoid direct calls to clamav. For more
details, please refer to https://phpunit.de/manual/4.8/en/test-doubles.html
Notice, that while it is possible to use setExpectedException in the tests,
this does not seem play correctly with consecutive assertions in the same
test after exception is thrown (they seem omitted). Explicit try/catch
construction has been used in testing instead.
To run just this test, use:
vendor/bin/phpunit antivirus_clamav_scanner_testcase lib/antivirus/clamav/tests/scanner_test.php
2016-02-29 09:31:30 +00:00
Ruslan Kabalin
ae3ba48272
MDL-50887 antivirus: Add unit tests for manager class.
...
To run just this test, use:
vendor/bin/phpunit core_antivirus_testcase lib/tests/antivirus_test.php
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
d08667a271
MDL-50887 antivirus_clamav: Access config properties using getter.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
17d7ee0eea
MDL-50887 antivirus: Add config getter to base class.
...
Improving architecture to make it testable.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
5b6a0f2c15
MDL-50887 antivirus_clamav: Split scanning logic and results processing.
...
This refactoring will make possible to assert scan results processing
behaviour in unit testing.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
56e915bb82
MDL-50887 antivirus: Replace 'antiviruses' with 'antivirus plugins'.
...
Language string chnages as per Helen Foster's comments in the ticket.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
ae784f716e
MDL-50887 antivirus: Refactor adminlib to use html_writer.
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
11362ae3ff
MDL-50887 antivirus: Use namespace referenced classes.
2016-02-29 09:31:09 +00:00
Dan Poltawski
b70b436875
Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle
2016-02-29 16:34:22 +08:00