55863 Commits

Author SHA1 Message Date
Aparup Banerjee
8be5407bc1 Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle
Conflicts:
	enrol/manual/locallib.php
2012-08-29 13:46:04 +08:00
Aparup Banerjee
8df0008856 Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle 2012-08-29 13:26:51 +08:00
Aparup Banerjee
a476581f0d Merge branch 'wip-MDL-34075-master' of git://github.com/abgreeve/moodle 2012-08-29 12:38:17 +08:00
Eloy Lafuente (stronk7)
77a7da60db MDL-31973 Groups: Bump version after changing versions in prev merge with conflicts. 2012-08-29 00:48:10 +02:00
Eloy Lafuente (stronk7)
238f7761af Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle
Conflicts:
	lib/db/upgrade.php
2012-08-29 00:42:43 +02:00
Eloy Lafuente (stronk7)
71ff7c2c04 Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle 2012-08-28 23:23:26 +02:00
Eloy Lafuente (stronk7)
af1e3f2828 Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle
Conflicts:
	enrol/self/editenrolment.php
2012-08-28 21:05:26 +02:00
Eloy Lafuente (stronk7)
5298faed69 Merge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle 2012-08-28 20:51:37 +02:00
Eloy Lafuente (stronk7)
928dfdee48 Merge branch 'MDL-34250' of github.com:stronk7/moodle 2012-08-28 20:44:09 +02:00
Eloy Lafuente (stronk7)
111938abd9 MDL-34250 navigation: Always look for correct parent context. 2012-08-28 20:37:46 +02:00
Eloy Lafuente (stronk7)
2ab9b983be MDL-25492 bb6 import: bump version after big changes. 2012-08-28 20:16:54 +02:00
Eloy Lafuente (stronk7)
14941785d7 Merge branch 'MDL-25492' of git://github.com/jmvedrine/moodle 2012-08-28 20:02:02 +02:00
Petr Škoda
71c3b0479a MDL-34955 fix use of uninitialised disabledsubplugins setting
Thanks Eloy Lafuente for spotting it!
2012-08-28 18:57:19 +02:00
Petr Škoda
5d605db1dc MDL-35064 improve enrol test comments
Thanks Aparup Banerjee for the feedback.
2012-08-28 15:28:17 +02:00
Petr Škoda
45fd6edfa4 MDL-35064 improve enrol plugin uninstall confirmation
Credit goes to Helen Foster, thanks!
2012-08-28 15:26:23 +02:00
Eloy Lafuente (stronk7)
d970005273 Merge branch 'MDL-34192' of git://github.com/stronk7/moodle 2012-08-28 14:44:06 +02:00
Eloy Lafuente (stronk7)
dbd0529ae5 MDL-34192 mod_assign: prevent ambiguous column use for Oracle.
Credit goes to Raymond Antonio from NetSpot.
2012-08-28 14:16:15 +02:00
Aparup Banerjee
23d82edc91 Merge branch 'MDL-31837' of git://github.com/timhunt/moodle 2012-08-28 17:03:55 +08:00
Aparup Banerjee
a4290d5803 Merge branch 'MDL-32464' of git://github.com/timhunt/moodle 2012-08-28 16:53:41 +08:00
Petr Škoda
ddcea181af MDL-34955 fix sloppy class typo and add MUC TODO info
Credit goes to Aparup Banerjee, thanks.
2012-08-28 16:17:43 +08:00
Aparup Banerjee
55fa9f1fa0 Merge branch 'w35_MDL-34990_m24_tinymcebuttonsfix' of git://github.com/skodak/moodle 2012-08-28 15:43:19 +08:00
Aparup Banerjee
4655497005 Merge branch 'w35_MDL-34879_m24_tinymcedocs' of git://github.com/skodak/moodle 2012-08-28 15:39:42 +08:00
Aparup Banerjee
1dd73f963c Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle 2012-08-28 15:10:35 +08:00
Aparup Banerjee
edcdd37525 Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle 2012-08-28 15:00:26 +08:00
Petr Škoda
af29ef049e MDL-23875 improve cohort only help
Credit goes to Helen Foster.
2012-08-28 08:32:23 +02:00
Aparup Banerjee
0c4ee46d77 Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle 2012-08-28 13:56:15 +08:00
Aparup Banerjee
2cdd5d8571 MDL-34549 added IGNORE_MISSING to context call for bc 2012-08-28 12:29:17 +08:00
Aparup Banerjee
9455f48280 Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle 2012-08-28 11:45:11 +08:00
Aparup Banerjee
6d04dc705c Merge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle 2012-08-28 11:35:24 +08:00
Adrian Greeve
96729f6d2d MDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance 2012-08-28 09:23:16 +08:00
Eloy Lafuente (stronk7)
1a5367873d Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle 2012-08-28 02:27:34 +02:00
Eloy Lafuente (stronk7)
a72ff024fb Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle 2012-08-27 20:12:18 +02:00
Eloy Lafuente (stronk7)
7b0c1bf02a Merge branch 'MDL-34306' of git://github.com/timhunt/moodle 2012-08-27 20:06:19 +02:00
Eloy Lafuente (stronk7)
f599c81597 Merge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle 2012-08-27 20:03:01 +02:00
Eloy Lafuente (stronk7)
af08f5d0af Merge branch 'MDL-34430' of git://github.com/timhunt/moodle 2012-08-27 18:50:29 +02:00
Eloy Lafuente (stronk7)
d683fcdf98 Merge branch 'MDL-34993' of git://github.com/timhunt/moodle 2012-08-27 18:35:23 +02:00
Eloy Lafuente (stronk7)
1edce590bd Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle 2012-08-27 18:17:55 +02:00
Eloy Lafuente (stronk7)
56f4e2a7a2 Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle 2012-08-27 18:07:24 +02:00
Eloy Lafuente (stronk7)
4299f5f6a8 Merge branch 'MDL-35026' of git://github.com/timhunt/moodle 2012-08-27 17:53:59 +02:00
Eloy Lafuente (stronk7)
7f7cda07f2 Merge branch 'MDL-35003' of git://github.com/timhunt/moodle 2012-08-27 17:50:55 +02:00
Petr Škoda
eef59b1254 MDL-35070 fix incorrect enrol join 2012-08-27 17:20:47 +02:00
Petr Škoda
764094585b MDL-35072 fix bogus left enrol join
Credit goes to Eloy, thanks.
2012-08-27 17:19:07 +02:00
Eloy Lafuente (stronk7)
05a024d393 Merge branch 'MDL-35023' of git://github.com/timhunt/moodle 2012-08-27 16:32:30 +02:00
Eloy Lafuente (stronk7)
d324394594 Merge branch 'MDL-35038' of git://github.com/timhunt/moodle 2012-08-27 16:24:17 +02:00
Eloy Lafuente (stronk7)
a787a404ea Merge branch 'MDL-35048' of git://github.com/lazydaisy/moodle 2012-08-27 16:20:19 +02:00
Eloy Lafuente (stronk7)
6b2b869049 Merge branch 'MDL-35055' of git://github.com/timhunt/moodle 2012-08-27 16:16:14 +02:00
Eloy Lafuente (stronk7)
aec4783bf6 Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle 2012-08-27 15:58:19 +02:00
Aparup Banerjee
f6bc04fe8a Merge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle 2012-08-27 17:26:14 +08:00
Aparup Banerjee
5cbda72684 Merge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle 2012-08-27 17:07:46 +08:00
Aparup Banerjee
889754ad31 Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle 2012-08-27 16:56:03 +08:00