moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72232 commits 37 branches 540 tags 1.3 GiB
Commit graph

4342 commits

Author SHA1 Message Date
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
Marina Glancy
b4b7587294 MDL-42400 modlib: include module file when it's used 
- changed the place where module file is included to make sure that add_moduleinfo() can be called independently from create_module()
- removed permission check from add_moduleinfo() because this function is not supposed to check permissions. Besides it's only half-check. See can_add_moduleinfo()
- added phpdocs to some functions to indicate that they can throw an exception
 2013-10-26 14:00:23 +11:00
Gareth J Barnard
e2cceaffad MDL-42270 course: Section name too big message. 2013-10-25 16:52:00 +01:00
Andrew Nicols
6a2da367aa MDL-42471 JavaScript: Adding missing dependency to toolbox 2013-10-25 13:40:40 +08:00
Eric Merrill
ac1a29755e MDL-42528 Activity Completion: DnD upload should obey default setting 
Make activities created by drad and drop obey Default completion
tracking setting.
 2013-10-24 17:50:08 -04:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-10-24 15:47:48 +08:00
Marina Glancy
33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
David Monllao
2a9275c4c5 MDL-40976 behat: Updating tests according to new behaviour 
We only open the actions menu when is collapsed.
 2013-10-23 16:19:33 +08:00
Rajesh Taneja
3f038d6d97 MDL-42283 Behat: Automated MDLQA-1777 
MDLQA-1777: A teacher can set grade conditions to restrict availability of a section
 2013-10-23 15:57:53 +08:00
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-23 17:22:28 +11:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Dan Poltawski
181b0b3c3e Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:42 +02:00
Andrew Nicols
d5367fb566 MDL-42117 JavaScript: Ensure that new activities are fully set up 
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
 2013-10-22 11:26:44 +08:00
Andrew Nicols
b676db838b MDL-42117 JavaScript: Don't rely on node data for course toolboxes 
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.

Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.

This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
 2013-10-22 11:26:36 +08:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
Rajesh Taneja
bafcd3f17a MDL-41811 navigation: Load site admin navigation 
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded

With no js, test should follow site admin link and not expand it.
 2013-10-21 14:17:55 +08:00
Rajesh Taneja
b92adf24a4 MDL-41811 navigation: Fixed navigation issues on pages 
Few admin pages don't add navigation node and hence they should
not show site admin
 2013-10-21 14:17:54 +08:00