4010 Commits

Author SHA1 Message Date
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
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
Sam Hemelryk
09ae02b7aa MDL-42300 course: improved category re-sort controls.
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
2013-11-05 09:48:38 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
a28c6b440e Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle 2013-11-04 22:54:09 +08:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Sam Hemelryk
ae3fd8eb76 MDL-42452 block: action menu is now constrained to the block container 2013-11-03 16:42:40 +08:00
Rajesh Taneja
3b732cd6cc MDL-42492 course: Show option to move category to top level
added behat to test move category
2013-11-01 15:53:38 +11:00
Marina Glancy
d2941e8808 Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle 2013-11-01 09:00:05 +08:00
Sam Hemelryk
cda49969c3 MDL-42300 course: improved category re-sort controls.
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
2013-11-01 08:57:39 +08:00
Marina Glancy
d3bd747db4 MDL-42318 coursecat: in unittests re-request category from DB after generating courses 2013-10-31 13:58:41 +11:00
David Monllao
32fcea7415 MDL-42385 behat: New test to cover MDL-38661
Also refactoring set site settings step
as it has problems to deal with multiple-field
settings.
2013-10-30 18:32:12 +08:00
Dan Poltawski
d147e833c0 Merge branch 'wip-MDL-42441-master' of git://github.com/marinaglancy/moodle 2013-10-29 17:28:25 +08:00
Marina Glancy
0ae13c0f63 MDL-42441 modules: Remove unnecessary code when creating the module in D&D
property groupmodelink is not used at all and groupmode is already processed
properly in core functions (respecting groupmodeforce property in course).
This looks like old code that has not been updated. It's a shame we
duplicate module creation login in draganddrop library
2013-10-29 20:12:51 +11:00
Dan Poltawski
c966d2e8c8 Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle 2013-10-29 15:03:52 +08:00
Dan Poltawski
7d3cdcc90d Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle 2013-10-29 13:16:44 +08:00
Marina Glancy
d61d3163af MDL-42318 coursecat: show correct courses count
courses count should exclude courses that are not visible to the current user
2013-10-29 10:26:56 +11:00
Dan Poltawski
4daa024fd4 Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle 2013-10-28 16:31:17 +08:00
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
Conflicts:
	login/change_password.php
2013-10-28 15:37:05 +08:00
Dan Poltawski
10ac20830b Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle 2013-10-28 14:53:21 +08:00
Frederic Massart
be99db5b96 MDL-22669 course: Display section number for orphaned activities 2013-10-28 14:44:08 +08:00
Marina Glancy
449d1fa3a4 MDL-42400 modlib: speed up add_moduleinfo, remove unnecessary queries
removed code that was causing unnecessary DB queries, this significantly speeds up data generators
2013-10-26 14:00:24 +11:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00