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
Sam Hemelryk
0669a9e9ae
Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle
2011-12-12 15:12:42 +13: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
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
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
Eloy Lafuente (stronk7)
f89a83b87b
weekly release 2.3dev (on-sync version 22_STABLE)
2011-12-09 16:25:08 +01:00
Eloy Lafuente (stronk7)
fef739423a
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-12-09 16:09:10 +01:00
Tim Hunt
511b4cf82c
MDL-30660 javascript-static: another yui3/ticket/2531561 work-around.
2011-12-09 12:40:57 +01:00
Eloy Lafuente (stronk7)
d6b380a364
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
2011-12-09 10:57:18 +01:00
Aparup Banerjee
675e402a55
MDL-30542 simple string improvement.
2011-12-09 17:14:30 +08:00
Petr Skoda
b8d13becf9
MDL-30625 fail gracefully when admins not defined
2011-12-09 09:04:43 +01:00
Mitsuhiro
ac4e8c3387
MDL-30198 Glossary Changing string during imports
2011-12-09 10:01:33 +05:30
Aparup Banerjee
70a7b8e1cd
Merge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle
2011-12-09 11:07:20 +08:00
Aparup Banerjee
29459d8e15
Merge branch 'MDL-30558' of git://github.com/timhunt/moodle
2011-12-09 10:46:23 +08:00
Aparup Banerjee
4000fce1a3
Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle
2011-12-09 10:19:22 +08:00
Aparup Banerjee
ce78f1d6f5
Merge branch 'master_MDL-30579' of git://github.com/mayankgupta/moodle
2011-12-09 10:13:22 +08:00
Tim Hunt
554de0d73a
MDL-27314 quiz reports: fix JS confirmation before deleting attempts.
2011-12-09 02:33:47 +01:00
Eloy Lafuente (stronk7)
08416e72e3
MDL-30604 Added 2 missing messages andd deleting an incorrect one
2011-12-09 02:01:02 +01:00
Aparup Banerjee
46f2a9366a
MDL-30604 Added upgrade lines to upgrade.php(s)
2011-12-09 01:28:59 +01:00
Eloy Lafuente (stronk7)
20405d1b44
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
2011-12-09 00:11:01 +01:00
Sam Hemelryk
f8b2e5458d
Merge branch 'MDL-30660' of git://github.com/timhunt/moodle
2011-12-09 11:46:09 +13:00
Eloy Lafuente (stronk7)
bc4869a828
Merge branch 'MDL-29579' of git://github.com/timhunt/moodle
2011-12-08 23:36:49 +01:00
Tim Hunt
e16c0b9da6
MDL-30660 javascript-static: M.util.show_confirm_dialog fixes
2011-12-08 17:50:11 +00:00
Andrew Robert Nicols
93e1d182e5
MDL-29195 Remove duplicate Participants -> Notes from navbar
2011-12-08 12:07:50 +00:00
Aparup Banerjee
1f8c6a9012
Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle
2011-12-08 17:00:37 +08:00
Aparup Banerjee
80923958d1
Merge branch 'wip-MDL-30336-master' of git://github.com/abgreeve/moodle
2011-12-08 16:04:30 +08:00
Aparup Banerjee
5ac06899c7
Merge branch 'wip-mdl-30560' of git://github.com/rajeshtaneja/moodle
2011-12-08 15:51:27 +08:00
Jerome Mouneyrac
b6dcb7d984
MDL-29942 trigger user events in web service calls
2011-12-08 14:40:57 +08:00
Aparup Banerjee
cd8805448d
Merge branch 'MDL-30350-master-1' of git://git.luns.net.uk/moodle
2011-12-08 14:19:46 +08:00
Aparup Banerjee
357317fb6e
Merge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/moodle
2011-12-08 13:56:51 +08:00
Aparup Banerjee
983fb3f4aa
Merge branch 'MDL-28710_rating_classes' of git://github.com/andyjdavis/moodle
2011-12-08 13:43:55 +08:00
Aparup Banerjee
a92365080d
Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle
2011-12-08 13:38:54 +08:00
Sam Hemelryk
9c6b40c614
Merge branch 'MDL-30518' of git://github.com/mackensen/moodle
2011-12-08 16:05:26 +13:00
Sam Hemelryk
4bd1fc7ef7
Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle
2011-12-08 15:50:42 +13:00
Sam Hemelryk
8e0169ebc2
Merge branch 'w50_MDL-30623_m23_guest' of git://github.com/skodak/moodle
2011-12-08 13:49:39 +13:00
Eloy Lafuente (stronk7)
08f2d600c1
Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle
2011-12-08 01:36:44 +01:00
AMOS bot
36101938ff
Automatically generated installer lang files
2011-12-08 00:31:13 +00:00
