mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
65,533 Commits 36 Branches 519 Tags
Commit Graph

4066 Commits

Author SHA1 Message Date
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
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
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
rwijaya
3e57883c5c MDL-42858 Course Management: fix regression for subcategories visibility 2013-11-21 15:32:50 +08:00
Marina Glancy
a99e1ad9ec Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle 2013-11-20 13:20:17 +11:00
Ankit Agarwal
542d3820d1 MDL-42767 events: Remove ob_clean from tests 2013-11-19 16:34:49 +08:00
Rajesh Taneja
3ea677e39a MDL-42403 course: Added behat to check visibility of bluk move action 2013-11-19 10:52:33 +08:00
Rajesh Taneja
a5888fb591 MDL-42403 course: Show bluk move to category only when something selected 2013-11-19 10:52:32 +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
sam marshall
db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
Andrew Nicols
11f8ef10c0 MDL-42737 ActionMenu: Close the menu after selecting actions 2013-11-06 17:16:49 +08:00
Damyon Wiese
dcd02d8b0e Merge branch 'MDL-40975-master-fixes' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-06 16:42:11 +08:00
Sam Hemelryk
52c93a26ca MDL-42375 course: management interface icon spacing improved 
Fixed the display of icons and their spacing when JS is disabled.
 2013-11-06 16:38:32 +08:00
Andrew Nicols
5609c6321d MDL-40975 Course: Make the edit title instructinos position with mod-indent 2013-11-06 16:20:00 +08:00
Andrew Nicols
868575ec2c MDL-40975 Course: Make spinner consistent across themes 2013-11-06 16:06:48 +08:00
Damyon Wiese
951b414b65 Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-06 13:06:01 +08:00
Damyon Wiese
ee8e077a2e Merge branch '42710-26' of git://github.com/samhemelryk/moodle 2013-11-06 12:07:47 +08:00