mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
68,162 Commits 36 Branches 519 Tags
Commit Graph

4195 Commits

Author SHA1 Message Date
Rajesh Taneja
2cd29dd6f1 MDL-44017 Events: Added unit test for report_viewed events 2014-03-07 15:16:10 +08:00
Dan Poltawski
dc88f6699d Revert "MDL-43852 Filters Fixed naked-OR conditions." 
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c554d12d9214928da6f10989fc5546dbb43.
 2014-03-06 09:03:19 +08:00
Dan Poltawski
ac8d049b47 Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle 2014-03-05 14:18:21 +08:00
Damyon Wiese
0cc30f6fcf Merge branch 'MDL-44370-master' of git://github.com/ankitagarwal/moodle 2014-03-05 13:44:56 +08:00
Dan Poltawski
673a96bd4e Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle 2014-03-05 10:52:46 +08:00
Dan Poltawski
f1284d3cfe Merge branch 'MDL-44272-master' of git://github.com/ankitagarwal/moodle 2014-03-04 15:59:55 +08:00
Ankit Agarwal
e662454a35 MDL-44370 calendar: Fix calendar url in reports 2014-03-04 15:06:20 +08:00
Dan Poltawski
cf77b7c932 Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle 2014-03-04 15:03:02 +08:00
Marina Glancy
ae29096b5b MDL-44321 unittest correction since snapshot is not a reference to object any more. 2014-03-04 14:56:20 +08:00
Damyon Wiese
267c4b4292 Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle 2014-03-04 13:29:03 +08:00
Gordon Bateson
840c1c554d MDL-43852 Filters Fixed naked-OR conditions. 2014-02-28 23:55:17 +01:00
Marina Glancy
6f9354beb0 MDL-44287 glossary: use course mod api to create new module when importing as new 2014-02-28 16:38:33 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files 
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
 2014-02-27 18:22:05 +08:00
Ankit Agarwal
df9a6c0114 MDL-44272 events: Fix incorrect urls in course module events 2014-02-24 15:08:22 +08:00
Sam Hemelryk
9bcde27f66 MDL-44185 course: fixed @package typo in report/lib.php 2014-02-24 09:26:59 +13:00
David Monllao
fbd904ef41 MDL-43802 behat: Testing deleted activity with JS enabled 2014-02-18 13:55:08 +08:00
David Monllao
0807908f17 MDL-44085 course: Replace JS confirm() by YUI confirm 2014-02-18 09:44:05 +13:00
sam marshall
5c3a54c478 MDL-44065 Course: _add_instance exception leads to inconsistent db 
If an exception occurs during a module's _add_instance function, this
results in a course_modules entry with instance=0. The system already
handled returning false to this function, but did not handle
exceptions.
 2014-02-17 10:51:09 +00:00
Dan Poltawski
a24ef7d7cd Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle 2014-02-17 14:40:36 +08:00
Andrew Nicols
af64bc6179 MDL-33099 Javascript: Deprecate the ajaxenabled function 2014-02-17 14:11:21 +08:00
Andrew Nicols
2ae7e4ddd6 MDL-43504 Course: Include the course/category collapse JS correctly 
This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
 2014-02-17 11:33:52 +08:00
Andrew Nicols
b44b0fdab4 MDL-43504 Javascript: Frontpage collapsing should not depend on enableajax 
This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
 2014-02-17 11:25:16 +08:00
Sam Hemelryk
b73fd8608a Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
 2014-02-11 14:10:52 +13:00
Sam Hemelryk
52b7e8aa58 Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle 2014-02-10 14:53:51 +13:00
Andrew Nicols
26df91ca57 MDL-43941 Behat: Section visibility tests should not check if activities are visible 
It should be possible for activities to be visible even when the section
they are in is hidden.

However, when a section is hidden, all activities in that section are also
then initially hidden. Therefore, this commit splits out the hidden test to
a new test so that the initial state of activities after hiding can still
be tested.
 2014-02-10 09:36:05 +08:00
Andrew Nicols
db6e9aa8d3 MDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections 2014-02-10 09:21:31 +08:00
Sam Hemelryk
e9eb744f6d Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle 2014-02-10 11:32:13 +13:00
Andrew Nicols
34bcc6a95c MDL-43267 Javascript: Improve accessibility of keyboard move 
Change the keyboard move descriptions to allow for more detailed
descriptions such as:
* "After 'X'"; or
* "To top of section 'Y'"
 2014-02-07 13:36:41 +08:00
Eloy Lafuente (stronk7)
845e11407f Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle 2014-02-04 10:11:42 +01:00
Marina Glancy
93c9a86dea MDL-43821 completion: fix bug in section completion progress 
Thanks to Shane Dye for the provided patch
 2014-01-31 16:56:43 +08:00
Marina Glancy
7456c96766 MDL-41384 course: do not show debugging message if $COURSE contains format options 
before showing debugging message make sure that field exists in database and not only in the object
 2014-01-31 16:56:30 +08:00
Andrew Nicols
d125cf103c MDL-43684 Course: Correct showing and hiding of resources on drag/drop 
This was caused by an issue with String casting in JavaScript.
In JavaScript, "0" evaluates as a truthy value.
 2014-01-30 11:03:08 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Sam Hemelryk
07481c9277 Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle 2014-01-29 08:23:51 +13:00
Mark Nelson
7cbb5070f5 MDL-40909 enrol_imsenterprise: removed 'new' add_to_log call 
Here we are replacing the unnecessary code used to create a course with
a call to create_course(), which triggers the event 'course_created'.
Nothing more is needed.
 2014-01-27 19:52:55 -08:00
Eloy Lafuente (stronk7)
bc6a79aee6 Merge branch '43688-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-27 23:58:18 +01:00
Eloy Lafuente (stronk7)
9be395ee99 Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle 2014-01-27 12:02:28 +01:00
Sam Hemelryk
5a3e5fa078 MDL-43688 dndupload: fixed positioning across themes 2014-01-24 09:52:47 +13:00
Marina Glancy
3ba635344f MDL-43800 course: groupings are sorted alphabetically 2014-01-22 12:16:26 +08:00
Eloy Lafuente (stronk7)
ba766c4772 Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle 2014-01-21 01:54:00 +01:00
Marina Glancy
639d990431 MDL-43211 course: do not return indent icon if not needed 2014-01-17 17:29:21 +08:00
David Monllao
561e9bb92e MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert 2014-01-17 10:41:37 +08:00
Damyon Wiese
a1ac22b815 Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle 2014-01-14 15:18:37 +08:00
Damyon Wiese
f8a60dfe88 Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
	course/yui/dragdrop/dragdrop.js
 2014-01-14 13:06:54 +08:00
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage! 
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
 2014-01-08 14:51:06 +08:00
Dan Poltawski
33c6c949e5 Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle 2014-01-08 11:56:53 +08:00
Dan Poltawski
ac60c5b60e Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle 2014-01-07 17:23:07 +08:00
Damyon Wiese
8af52d3188 Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle 2014-01-07 16:57:49 +08:00
Damyon Wiese
715d0505c4 Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle 2014-01-07 16:16:48 +08:00
Damyon Wiese
fcd640a51a Merge branch 'MDL-43271-master' of git://github.com/andrewnicols/moodle 2014-01-07 16:15:16 +08:00