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

4032 Commits

Author SHA1 Message Date
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
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
Andrew Nicols
f5b33487fc MDL-40975 ActionMenu: Adjust how actionmenu is displayed for course management 2013-11-06 11:41:00 +08:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Barbara Ramiro
6272fce649 MDL-42564 Course: Replace group mode icons with larger versions 2013-11-06 11:40:58 +08:00
Andrew Nicols
6982618e89 MDL-40956 Course: AJAX course duplication 2013-11-06 11:40:57 +08:00
Andrew Nicols
8d90aec2aa MDL-40975 Course: Make the completion tracking look the same as other icons when editing 2013-11-06 11:40:57 +08:00
Andrew Nicols
26dd99d292 MDL-40975 Course: Move all editing icons to the end of the line 2013-11-06 11:40:56 +08:00
Andrew Nicols
9ac099a1c1 MDL-40975 ActionMenu: Add support for fillers in primary menus 
This is required to maintain horizontal alignment of primary menus in rows.
 2013-11-06 11:40:56 +08:00
Andrew Nicols
4bbb890f91 MDL-40975 Course: Adjust how we handle toolbox processing to improve performance 2013-11-06 11:40:55 +08:00
Damyon Wiese
9577caaed8 MDL-40975 ActionMenu: Change default alignment when opening the menu 
Committer: Andrew Nicols <andrew@nicols.co.uk>
 2013-11-06 11:40:54 +08:00
Andrew Nicols
d881e0bb84 MDL-40975 Course: Remove groupmode when forced at course level 2013-11-06 11:40:53 +08:00
Andrew Nicols
82ef49ea65 MDL-40975 Course: Set the show/hide activity toggle 2013-11-06 11:40:53 +08:00
Andrew Nicols
81dc079654 MDL-40975 Course: Hide commands when editing titles 2013-11-06 11:40:51 +08:00
Andrew Nicols
3072040cff MDL-40975 JavaScript: Standardise the location of the activity spinner 2013-11-06 11:40:51 +08:00
Andrew Nicols
4657ba81d2 MDL-40975 Course: Move drag/drop to start of the line 2013-11-06 11:40:50 +08:00
Andrew Nicols
a83d83e42b MDL-40975 Course: Change which actions are in the menu and which are outside it 2013-11-06 11:40:49 +08:00
Andrew Nicols
f549dd64a4 MDL-40975 Course: Change the activity drag icon to prevent icon flash 2013-11-06 10:59:26 +08:00
Sam Hemelryk
c820e700d8 ML-42629 course: management added can_resort checks 2013-11-06 08:49:36 +08:00
Sam Hemelryk
e69a0251dc MDL-42710 course: management cat sorting perfecting taking place 2013-11-05 21:52:45 +08:00
Damyon Wiese
48bde0eed4 MDL-42629: Fixing dodgy merge conflict (oops) 2013-11-05 16:36:31 +08:00
Damyon Wiese
9e16402727 Merge branch '42629-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	course/classes/management_renderer.php
 2013-11-05 14:04:08 +08:00
Sam Hemelryk
38a15200b9 MDL-42629 course: management peer-review alterations 
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
 2013-11-05 13:57:01 +08:00
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
Dan Poltawski
6ce30a3e2c Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle 2013-11-05 12:34:35 +08:00
Damyon Wiese
97c7b8a548 Merge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle 2013-11-05 12:24:41 +08:00
Damyon Wiese
1ddbe7815d Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle 2013-11-05 11:06:23 +08:00
Michael de Raadt
2bec969e2a MDL-42703 Course: Remove alias from queries to satisfy MSSQL 2013-11-05 10:52:24 +08:00
Sam Hemelryk
c7a2291f8b MDL-42629 course: management resorting improvements 2013-11-05 09:49:20 +08:00
Sam Hemelryk
62846237ee MDL-42629 course: set a better management page title 2013-11-05 09:49:14 +08:00
Sam Hemelryk
d3670843eb MDL-42629 course: changed new course to create new course 2013-11-05 09:49:14 +08:00
Sam Hemelryk
bd7ee7ada4 MDL-42629 course: moving a course now updates counts and pagination totals 2013-11-05 09:49:14 +08:00
Sam Hemelryk
017518d4f8 MDL-42629 course: fixed up create category management actions 2013-11-05 09:49:13 +08:00
Sam Hemelryk
115e5f052f MDL-42629 course: renamed re-sort to sort 2013-11-05 09:49:13 +08:00
Sam Hemelryk
21a57b04de MDL-42629 course: improved wording on move course dialogue 2013-11-05 09:48:38 +08:00