Commit graph

51044 commits

Author SHA1 Message Date
Aparup Banerjee
c47b8c7d0c Merge branch 'MDL-30288_override_checkbox' of git://github.com/andyjdavis/moodle 2011-11-24 16:14:37 +08:00
Ankit Kumar Agarwal
6348043461 MDL-30422 SCORM Fixing old variable use in interraction report 2011-11-24 12:53:37 +05:30
Aparup Banerjee
3ca3098f31 Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle 2011-11-24 14:39:53 +08:00
Andrew Davis
185db1c962 MDL-30288 gradebook: prevented grade grade feedback being wrapped in a text to html div tag which was causing it to look like feedback had been edited when it hadn't 2011-11-24 11:27:13 +08:00
AMOS bot
6c72ee14cd Automatically generated installer lang files 2011-11-24 00:31:00 +00:00
Eloy Lafuente (stronk7)
c08a5622b8 Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle 2011-11-23 23:01:27 +01:00
Petr Skoda
73d000f389 MDL-27233 allow adding of default role to restorers 2011-11-23 18:38:27 +01:00
Petr Skoda
d53e3298c0 MDL-27233 add new options to keep enrols and groups purging existing course in restore 2011-11-23 18:38:27 +01:00
Petr Skoda
16ef46e7b6 MDL-29450 improve and cleanup course content removal
New keep roles/enrolments and groups/groupings options, notification CSS fixed, standardised notification texts, added missing delete of module blocks, fixed file deleting and some other minor issues.
2011-11-23 18:37:36 +01:00
Andrew Robert Nicols
9e23487a10 MDL-30428 Add br tag when showing the 'Export to Portfolio' text 2011-11-23 14:07:52 +00:00
Eloy Lafuente (stronk7)
43fb30d652 Merge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle 2011-11-23 13:37:37 +01:00
Eloy Lafuente (stronk7)
8ccbf8d1e5 Merge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle 2011-11-23 13:33:39 +01:00
Eloy Lafuente (stronk7)
07a27990a0 Merge branch 'wip-mdl-30375' of git://github.com/rajeshtaneja/moodle 2011-11-23 13:28:24 +01:00
Eloy Lafuente (stronk7)
c897e4639c Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle 2011-11-23 13:19:21 +01:00
Eloy Lafuente (stronk7)
9002363b35 Merge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle 2011-11-23 13:16:04 +01:00
Eloy Lafuente (stronk7)
ab9dde2f97 Merge branch 'MDL-29095' of git://github.com/timhunt/moodle 2011-11-23 12:05:36 +01:00
Eloy Lafuente (stronk7)
48e74d2c10 Merge branch 'MDL-29060' of git://github.com/timhunt/moodle 2011-11-23 11:47:51 +01:00
Eloy Lafuente (stronk7)
1bb98bd7a4 Merge branch 'wip-mdl-28947' of git://github.com/rajeshtaneja/moodle 2011-11-23 11:37:34 +01:00
Eloy Lafuente (stronk7)
5535390c55 Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle 2011-11-23 11:22:50 +01:00
Eloy Lafuente (stronk7)
3a02133f3f Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle 2011-11-23 11:07:50 +01:00
Aparup Banerjee
c32e3a0a0a Merge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle 2011-11-23 14:34:34 +08:00
Aparup Banerjee
9d06eb139c MDL-29995 Filters - added MDL issue number to Todo. 2011-11-23 13:51:11 +08:00
Aparup Banerjee
d7de1c8a62 Merge branch 'MDL-29995' of git://github.com/stronk7/moodle 2011-11-23 13:47:52 +08:00
Aparup Banerjee
4cff8cb550 Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle 2011-11-23 12:36:35 +08:00
Aparup Banerjee
a9c56ad2df Merge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle 2011-11-23 12:06:58 +08:00
Sam Hemelryk
b674092416 Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle 2011-11-23 16:52:08 +13:00
Aparup Banerjee
03848c4568 MDL-30335 formslib : phpdoc improvement 2011-11-23 11:47:06 +08:00
Aparup Banerjee
5cde86faa9 Merge branch 'MDL-30335' of git://github.com/timhunt/moodle 2011-11-23 11:41:58 +08:00
Jason Fowler
2c5857186b MDL-29469 Enrolments - fixing the role assignment access elevation issue 2011-11-23 11:23:05 +08:00
Aparup Banerjee
d2b5a2caf5 Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle 2011-11-23 11:12:03 +08:00
Mary Evans
4ea621f75b MDL-29778 Fix to make user selector arrow visible 2011-11-23 15:54:59 +13:00
Kordan
b9b9614356 MDL-29830 theme_base: Fix overflow problems with navigation items 2011-11-23 15:48:03 +13:00
Rossiani Wijaya
4fd95658bb MDL-29115 lesson mod: fixed the display of 'try again' button so it relates to lesson setting 2011-11-23 10:34:49 +08:00
Rajesh Taneja
2d8732d199 MDL-30375 Blocks: Comments block will show blank textbox rather then hiding and 'add a comment' will be visible if it's empty 2011-11-23 10:32:14 +08:00
Eloy Lafuente (stronk7)
a0d26f45f7 Merge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle 2011-11-23 03:06:18 +01:00
Eloy Lafuente (stronk7)
7722bb5df8 Merge branch 'MDL-27045' of git://github.com/timhunt/moodle 2011-11-23 03:01:50 +01:00
adrian@moodle.com
b489d37d56 MDL-27334 - forum - Fixed the issue of error session keys being displayed when trying to browse to a site without logging in. 2011-11-23 09:43:39 +08:00
Sam Hemelryk
b8a2a92773 Merge branch 'MDL-30192' of git://github.com/stronk7/moodle 2011-11-23 14:11:23 +13:00
Eloy Lafuente (stronk7)
689461f4d8 Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle 2011-11-23 02:00:53 +01:00
Sam Hemelryk
ba54648b45 Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle 2011-11-23 13:54:26 +13:00
Eloy Lafuente (stronk7)
0f6cc7a7cc Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle 2011-11-23 01:44:49 +01:00
AMOS bot
20adbd65cd Automatically generated installer lang files 2011-11-23 00:30:58 +00:00
Eloy Lafuente (stronk7)
ea46fcbced Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle 2011-11-23 01:20:39 +01:00
Eloy Lafuente (stronk7)
1316fc8af9 Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle 2011-11-23 01:18:00 +01:00
Eloy Lafuente (stronk7)
8ea233e7ad Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle 2011-11-23 01:11:01 +01:00
Eloy Lafuente (stronk7)
7242b051ac Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle 2011-11-23 01:07:44 +01:00
Eloy Lafuente (stronk7)
c8a82fdbfe Merge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle 2011-11-23 01:04:29 +01:00
Mary Evans
b04ae8ad2b MDL-30164 FIX for missing gap between icon and text in reports 2011-11-23 12:59:04 +13:00
Mary Evans
6207bf8f05 MDL-30196 changed reference from Serenity to Sky High in theme_sky_high.php 2011-11-23 12:50:08 +13:00
Sam Hemelryk
f2d11739a8 Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2 2011-11-23 12:41:24 +13:00