Commit Graph

4073 Commits

Author SHA1 Message Date
Damyon Wiese 3a8e16ecab Merge branch 'MDL-43411-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-01-07 12:52:49 +08:00
Rajesh Taneja c783a874f0 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:27 +08:00
Andrew Nicols 74b0aca7eb MDL-42801 JavaScript: Fix dndupload to match actual style 2013-12-28 09:15:27 +08:00
Sam Hemelryk f2b1768da6 Merge branch 'MDL-43410-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2013-12-24 09:12:47 +13:00
Andrew Nicols 5c7d7dec73 MDL-43411 JavaScript: Correct checks for section support to use helper function 2013-12-23 09:45:24 +08:00
Mark Nielsen 13e8736049 MDL-37679 Course: Adding section to page title on section only pages 2013-12-17 11:42:38 +08:00
Andrew Nicols 829897be3e 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-17 09:57:58 +08:00
David Monllao fff8b97ebc 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.
2013-12-12 13:42:56 +08:00
Eloy Lafuente (stronk7) 3675c98506 Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2013-12-10 23:31:51 +01:00
Sam Hemelryk e5bb9741b6 Merge branch 'MDL-43164-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2013-12-10 09:50:27 +13:00
David Monllao db13e21956 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:11:48 +08:00
David Monllao 9f8ef4294a 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 15:53:55 +08:00
David Monllao 503c8dddcc MDL-42625 behat: Editing .feature files 2013-12-06 15:53:50 +08:00
Jason Fowler 3690a9db9f MDL-43083 Course: Swapping the edit/cog for the right size icon 2013-12-04 09:53:42 +08:00
Damyon Wiese cb891e57f0 Merge branch 'wip-MDL-42731-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2013-12-03 17:29:57 +08:00
Andrew Nicols 2d6dfcde3e 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:42 +08:00
Tim Hunt b14196043d 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-12-02 11:12:53 +08:00
Marina Glancy 0a44a45fea MDL-42731 block_activity_modules: added behat tests 2013-12-02 10:15:52 +11:00
Marina Glancy fdc93e4092 MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode 2013-12-02 10:15:33 +11:00
Dan Poltawski 44e5ac93bc Merge branch 'MDL-40741_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2013-11-26 14:57:15 +08:00
David Monllao addedcb142 MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 13:00:24 +08:00
rwijaya bb68dfc002 MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test 2013-11-25 15:40:07 +08:00
Dan Poltawski 9e2bc0490f Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-25 10:49:02 +08:00
rwijaya 2834f79e73 MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:34:40 +08:00
Ankit Agarwal dbc251e25c MDL-42767 events: Remove ob_clean from tests 2013-11-20 13:22:27 +11:00
Rajesh Taneja ffe199b1fa MDL-42403 course: Added behat to check visibility of bluk move action 2013-11-19 11:44:48 +08:00
Rajesh Taneja d583059471 MDL-42403 course: Show bluk move to category only when something selected 2013-11-19 11:44:43 +08:00
Damyon Wiese 6bce5b846a Merge branch 'wip-MDL-42833-master' of git://github.com/marinaglancy/moodle 2013-11-13 15:57:07 +08:00
Marina Glancy 5268dbffef Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle 2013-11-13 13:28:46 +11:00
Marina Glancy 9fcd029012 MDL-42833 course: correction to navigation path in management interface 2013-11-13 12:03:46 +11:00
Eloy Lafuente (stronk7) 662c5263b0 Merge branch '42832-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-13 01:55:52 +01:00
Eloy Lafuente (stronk7) aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
Sam Hemelryk aa861f6297 MDL-42832 course: management viewmode string improvements 2013-11-12 15:32:59 +08:00
Sam Hemelryk a14515990c MDL-41392 course: management fixed skiplinks breaking clean columns 2013-11-12 14:26:39 +08:00
Andrew Nicols 1e98b1641a MDL-42827 JavaScript: Use a more specific selector for activity links 2013-11-12 10:25:52 +08:00
Andrew Nicols 4c0664b950 MDL-42783 Course: Improve accessiblity of various course actions 2013-11-11 21:03:41 +11:00
Sam Hemelryk cd96b7d3e4 MDL-41392 course: management checkbox accessibility improvement 2013-11-11 17:10:14 +08:00
Sam Hemelryk d0647301a0 MDL-41392 course: management accessibility tweaking 2013-11-11 17:09:44 +08:00
Sam Hemelryk 68bcc3faaf Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle 2013-11-11 14:10:21 +08:00
Renaat Debleu 6382c482c8 MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
2013-11-11 10:24:09 +08:00
Dan Poltawski dbb68d7779 Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle 2013-11-08 16:05:06 +08:00
Rajesh Taneja be3d6de5aa MDL-42777 courses: Added behat to test ajax on course view page 2013-11-08 14:44:04 +08:00
Rajesh Taneja 428a1bbdb1 MDL-42777 courses: removed unneeded category check
On course view manage page, JS was not getting initalised as category-listing
is not visible, initialiseCourses is doing unnessary check for category as
it takes care of empty category so it should not return on empty category
2013-11-08 14:08:46 +08:00
Damyon Wiese d25e988d08 Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle 2013-11-08 08:45:11 +08:00
Dan Poltawski 0967c74a3d Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle 2013-11-07 17:21:54 +08:00
Andrew Nicols 5bf8e9ae5e MDL-40975 Course: Ensure that editinstructions line up with activity rename again 2013-11-07 16:46:34 +08:00
Sam Hemelryk 10a2bf4613 MDL-42375 course: management interface icon tweaks
* Drag and drop icon switched to a 12x12px icon.
* Drag and drop icon now uses cursor:pointer
* Improved alignment of the caret for course listing actions.
2013-11-07 14:01:17 +08:00
Damyon Wiese 81b07e655c Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 12:23:25 +08:00
Marina Glancy ef14a8ffb4 Merge branch '42375-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-07 14:18:00 +11:00
Andrew Nicols 4c9e8ea7a3 MDL-40975 Course: Fix issues with overflowing content in narrow windows 2013-11-07 01:16:34 +08:00