Commit graph

4230 commits

Author SHA1 Message Date
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
Damyon Wiese
778c03ccb1 Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle 2014-01-07 12:53:07 +08:00
Sam Hemelryk
39bd07f732 MDL-43526 course: links to restore from management and admin structure. 2014-01-07 12:08:34 +08:00
Rajesh Taneja
3231c8cbf6 MDL-42643 course: Member in same group should only loginas
If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user
2014-01-07 11:05:20 +08:00
Andrew Nicols
5b9e2cc78b MDL-35423 JavaScript: Reduce specifity of course AJAX
Some themes may choose not to use the same layout as core themes. Reduce
the specifity of these to allow other themes to use our JavaScript without
following the same markup.
2014-01-07 09:51:04 +11:00
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Andrew Nicols
b4ab504574 MDL-43534 Course: Remove deprecated functions from course/renderer
This function was deprecated in 2.4 and was due for removal in 2.6.

Removing as per deprecation policy.
2014-01-02 11:35:33 +08:00
Andrew Nicols
e9a235e444 MDL-43531 Course: Remove deprecated functions from dnduploadlib
These functions were deprecated in 2.5 and are due for removal in 2.7.

Removing as per deprecation policy.
2014-01-02 11:20:01 +08:00
Andrew Nicols
80cd508669 MDL-34356 JavaScript: Allow chooser dialogues to submit values for hidden elements
When we submit the chooser dialogue, we disable the radio buttons used for
selection. Since browsers do not actually submit values for disabled
elements, we store the radio value in a hidden element which is not
disabled.

This commit abstracts this out of the activity chooser and into the generic
chooser dialogue such that other types of chooser dialogue may use it.
2013-12-28 11:35:52 +08:00
Andrew Nicols
9b2ad813b8 MDL-42801 JavaScript: Fix dndupload to match actual style 2013-12-28 09:13:40 +08:00
Sam Hemelryk
a92617fa3f Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle 2013-12-24 09:13:05 +13:00
Andrew Nicols
fd03a33c35 MDL-43270 JavaScript: Migrate moodle-course-dragdrop to use Shifter 2013-12-23 17:09:39 +08:00
Andrew Nicols
80c2d36007 MDL-43273 JavaScript: Migrate moodle-course-coursebase to use Shifter 2013-12-23 16:34:54 +08:00
Andrew Nicols
672ce80ea6 MDL-43271 JavaScript: Migrate moodle-course-formatchooser to use Shifter 2013-12-23 16:23:54 +08:00
Andrew Nicols
47281f7ede MDL-43411 JavaScript: Correct checks for section support to use helper function 2013-12-23 09:35:34 +08:00