moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51252 commits 37 branches 544 tags 1.3 GiB
Commit graph

51252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aparup Banerjee
9b91efe5bc Merge branch 'MDL-30559' of git://github.com/timhunt/moodle 2011-12-13 12:02:05 +08:00
Aparup Banerjee
099f23b7d7 Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle 2011-12-13 11:11:47 +08:00
Petr Skoda
62988bf0bb MDL-30575 more mail header cleanup 2011-12-13 10:23:41 +08:00
Mayank Gupa
a16abd537d MDL-30645, Fixing evaluation of default value of CMI elements. 2011-12-13 10:12:27 +08:00
Sam Hemelryk
302991ba37 Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle 2011-12-13 12:08:12 +13:00
Sam Hemelryk
746e7c4a5e Merge branch 'MDL-30677' of git://github.com/timhunt/moodle 2011-12-13 11:20:22 +13:00
Sam Hemelryk
6508fbc37d Merge branch 'MDL-30532' of git://github.com/timhunt/moodle 2011-12-13 11:15:27 +13:00
Sam Hemelryk
de3e5df24f Merge branch 'MDL-30498a' of git://github.com/timhunt/moodle 2011-12-13 11:11:33 +13:00
Sam Hemelryk
0ebb6ff5b8 Merge branch 'MDL-27143' of git://github.com/timhunt/moodle 2011-12-13 10:25:29 +13:00
Sam Hemelryk
2b9131991f Merge branch 'w51_MDL-30621_m23_protectdir' of git://github.com/skodak/moodle 2011-12-13 10:17:45 +13:00
Petr Skoda
7a7edd21f2 MDL-30621 more dataroot protection 2011-12-12 15:06:47 +01:00
Andrew Robert Nicols
6b3a341a95 MDL-30653 Remove duplicate Participants link from navbar 2011-12-12 10:42:42 +00:00
Rossiani Wijaya
7349495160 MDL-30463 lesson module: add space between yes and no options on start last attempt page 2011-12-12 17:14:45 +08:00
Andrew Davis
5625d33d17 MDL-25561 grade: made the student names clickable on the user report 2011-12-12 15:57:04 +08:00
Rossiani Wijaya
8367651ee4 MDL-29239 fixed edit course setting for moodle/course:changesummary permission is set to prevent. 2011-12-12 15:52:13 +08:00
Mayank Gupa
3cf721bf23 Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30577 2011-12-12 13:20:44 +05:30
Mark Nielsen
8fbb55ac8b MDL-29048 Glossary Force glossary type to secondary while trying to duplicate a mail glossary 2011-12-12 12:33:56 +05:30
Aparup Banerjee
c45c1e1f20 Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle 2011-12-12 14:36:59 +08:00
Aparup Banerjee
9f26a481ae MDL-30603 synced and renamed incorrect ZF 1.10.6 file and name 2011-12-12 14:21:52 +08:00
Mayank Gupa
7ec0b1a936 Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30576 2011-12-12 10:53:23 +05:30
Sam Hemelryk
9997c057a2 Merge branch 'w51_MDL-29117_m23_enrolnewcourse' of git://github.com/skodak/moodle 2011-12-12 17:57:00 +13:00
Sam Hemelryk
82da6c5c5f Merge branch 'w51_MDL-30292_m23_health' of git://github.com/skodak/moodle 2011-12-12 17:40:47 +13:00
Sam Hemelryk
94db939f7c Merge branch 'w51_MDL-30364_m23_report' of git://github.com/skodak/moodle 2011-12-12 17:37:27 +13:00
Sam Hemelryk
0e3e2c82dd Merge branch 'w51_MDL-30415_m23_yui2rollups' of git://github.com/skodak/moodle 2011-12-12 17:29:11 +13:00
Sam Hemelryk
bbf9358c49 Merge branch 'w51_MDL-30502_m23_ldapenrol' of git://github.com/skodak/moodle 2011-12-12 17:24:14 +13:00
Sam Hemelryk
07ae3349fc Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle 2011-12-12 17:10:58 +13:00
Sam Hemelryk
16fdb8d070 Merge branch 'w51_MDL-30659_m23_yuidebug' of git://github.com/skodak/moodle 2011-12-12 16:36:51 +13:00
Sam Hemelryk
3a6e1e2b78 Merge branch 'w51_MDL-30687_m23_ldapnewcourse' of git://github.com/skodak/moodle 2011-12-12 16:10:05 +13:00
Jason Fowler
d79de196c9 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-12 10:46:10 +08:00
Sam Hemelryk
0669a9e9ae Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle 2011-12-12 15:12:42 +13:00
Charles Fulton
b92ac8c079 MDL-30482 create new capability for viewing glossary entries 2011-12-12 09:59:41 +08:00
Sam Hemelryk
273e24ffa4 Merge branch 'MDL-28180' of git://github.com/stronk7/moodle 2011-12-12 14:54:35 +13:00
Sam Hemelryk
d35fc666d6 Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle 2011-12-12 13:54:48 +13:00
Sam Hemelryk
ffdbcf3998 Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle 2011-12-12 13:50:42 +13:00
Eloy Lafuente (stronk7)
4d856332e4 MDL-28180 backup - on restore always prevent completion_aggr_methd dupes 
This covers the last case where dupes could be happening in the
completion_aggr_methd table: Restoring one complete course into
an existing one, adding information. Now we always check if the
aggr_method exists before inserting it.
 2011-12-12 00:31:44 +01:00
Eloy Lafuente (stronk7)
43cf3165f1 MDL-28180 backup - take rid of dupes in course_completion_aggr_methd 
Conflicts:

	version.php
 2011-12-12 00:31:29 +01:00
Eloy Lafuente (stronk7)
184acafab6 MDL-28180 backup - set excluded activities for any non-course operation 2011-12-12 00:30:58 +01:00
Petr Skoda
433150f6cf MDL-30687 use course defaults when template not set in ldap enrol 2011-12-11 11:06:29 +01:00
Petr Skoda
9f38ba6860 MDL-29117 use default course settings when template not set in db enrol 2011-12-11 10:57:44 +01:00
Dan Marsden
a12b1d751d MDL-28728 SCORM - only show delete button if data exists for this user in this scorm 2011-12-11 19:10:28 +13:00
Dan Marsden
d32e353e35 MDL-28728 SCORM - add capability to allow users to delete own attempts - given to no-one by default. 2011-12-11 19:10:28 +13:00
Dan Marsden
b47316cded MDL-29325 imsenterprise enrolment - allow more flexible naming of courses - thanks to Adam Barbary for patch 2011-12-11 19:07:23 +13:00
Petr Skoda
14074ef7c6 MDL-30292 rework trailing whitespace test 
Now compatible with zlib compression.
 2011-12-10 20:33:51 +01:00
Petr Skoda
a0b15989e7 MDL-30364 fix user report regressions 2011-12-10 20:18:44 +01:00
Petr Skoda
a1dd2a54e3 MDL-30415 prevent yui2 rollups in debug mode 2011-12-10 19:11:58 +01:00
Petr Skoda
0c79e389f8 MDL-30502 remove bogus role name param 
Credit goes to Michael J Litzkow.
 2011-12-10 18:34:08 +01:00
Petr Skoda
adf0fc0e42 MDL-30621 prevent warnings when creating temp and cache dirs 2011-12-10 17:35:22 +01:00
Petr Skoda
cb664c3a0d MDL-30659 fix use of yui filters 2011-12-10 13:46:15 +01:00
Petr Skoda
7edf3f7e82 MDL-30659 fix phpdocs problems 2011-12-10 13:16:18 +01:00
Petr Skoda
dbd7282ca3 DML-30588 do not require enrollment after switching of roles 2011-12-10 12:44:32 +01:00