4152 Commits

Author SHA1 Message Date
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
Andrew Nicols
af4d19abfb MDL-43410 JavaScript: Stop event propagation when opening the action menu
In certain situations, the click event is propagated through to the
hideIfOutside and immediately closes the menu.

This happens when blocks are dock for example.
2013-12-18 11:44:43 +08:00
Sam Hemelryk
04102046ef Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle 2013-12-18 09:55:04 +13:00
Marina Glancy
2280ad064d Merge branch 'MDL-37679-master' of git://github.com/phalacee/moodle 2013-12-17 16:37:19 +11:00
Jason Fowler
761c5fc274 MDL-37679 Course: Adding section name to page title 2013-12-17 11:42:01 +08:00
Dan Poltawski
1f1a8f03d8 MDL-38832 course: remove unused constants 2013-12-12 16:44:20 +08:00
David Monllao
fb99ef1ded MDL-42625 behat: Fixing failures
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it
2013-12-12 13:41:07 +08:00
Sam Hemelryk
769ed2bd5d NOBUG: shifter rebuild 2013-12-11 12:26:47 +13:00
Sam Hemelryk
7458012637 Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle 2013-12-11 12:25:12 +13:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Andrew Nicols
43736b7dd0 MDL-43272 JavaScript: Migrate moodle-course-modchooser to use Shifter 2013-12-10 18:41:46 +08:00
Sam Hemelryk
a88c1ca91a Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:52:08 +13:00
David Monllao
c1faf86bd1 MDL-42625 behat: Make behat pacient
* When looking for texts inside the page or inside
  other containers we should wait until the elements
  are visible.
* Same when expanding tree nodes.
* Normalizing loops to spin() function using
  behat_base::TIMEOUT and behat_base::EXTENDED_TIMEOUT,
  leaving TIMEOUT for DOM load processes and
  EXTENDED_TIMEOUT for long processes that involves JS
  too.
* Add page load waits between actions that involves
  reloading the page.
2013-12-09 11:08:42 +08:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 2013-12-06 12:13:39 +08:00
Andrew Nicols
d692861010 MDL-43202 JavaScript: Migrate moodle-course-toolboxes to user Shifter 2013-12-04 22:05:16 +08:00
Damyon Wiese
88e39201d7 Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle 2013-12-04 09:52:51 +08:00
Damyon Wiese
a977fa7b36 Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle 2013-12-03 17:29:39 +08:00
Andrew Nicols
69353dcecd MDL-43164 JavaScript: Use the up/down move icon for non-AJAX courses
When a course format does not support AJAX, or AJAX is disabled at the site
level, we should revert back to the old-style move icon.

This helps to clarify that you cannot drag/drop the icon, but must click
instead.
2013-12-03 10:49:29 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Marina Glancy
9842e231e8 MDL-42731 block_activity_modules: added behat tests 2013-12-02 17:44:32 +11:00
Marina Glancy
6dfd8325f0 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 17:44:32 +11:00
Dan Poltawski
9a7de39d7a Merge branch 'MDL-43068' of git://github.com/timhunt/moodle 2013-12-02 11:11:07 +08:00
Tim Hunt
1c73df9eea MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.

Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).

In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
2013-11-27 17:40:40 +00:00
Jason Fowler
d9308a07e8 MDL-43083 Course: Swapping the edit/cog for the right size icon 2013-11-27 15:06:25 +08:00
Dan Poltawski
2bc34d6528 Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle 2013-11-26 14:52:21 +08:00
David Monllao
5df9e40cec MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
rwijaya
a13b9929a2 MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test 2013-11-25 15:39:22 +08:00
Dan Poltawski
f5bc16cbd1 Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:48:33 +08:00