Eloy Lafuente (stronk7)
f04da0f051
Merge branch 'MDL-28684' of git://github.com/timhunt/moodle
2011-08-24 17:08:31 +02:00
Tim Hunt
4ca3f2d167
MDL-28684 fix failing unit test - which means fix the acutal code.
...
Sorry for the noise.
2011-08-24 16:00:37 +01:00
Eloy Lafuente (stronk7)
a3f2ad4e80
Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
2011-08-24 16:24:21 +02:00
Eloy Lafuente (stronk7)
07ad6c600c
Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
2011-08-24 16:12:19 +02:00
Petr Skoda
c16c1be700
MDL-26796 accept objects that can be converted to string in clean_param()
2011-08-24 16:09:25 +02:00
Petr Skoda
0f70414078
MDL-28929 document themes api changes
2011-08-24 15:11:25 +02:00
Petr Skoda
7339273895
Merge branch 'w33_MDL-28554_m22_yui' of github.com:skodak/moodle
2011-08-24 15:01:50 +02:00
Petr Skoda
9d753c38d7
MDL-28554 fix problematic loading of io-upload-frame
...
This is a bit of a mystery, somehow 'io' module dependency is not enough to load everything, this might be caused by a regression in yui.
2011-08-24 15:00:10 +02:00
Eloy Lafuente (stronk7)
0a4ca115b2
Merge branch 'w33_MDL-26796_m22_arrayparams' of git://github.com/skodak/moodle
2011-08-24 14:06:22 +02:00
Eloy Lafuente (stronk7)
6408c7d9f0
NOBUG: Minibump needed here for some automated tests to happen
2011-08-24 13:35:24 +02:00
Eloy Lafuente (stronk7)
ca5c3667cd
Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
2011-08-24 13:31:54 +02:00
Eloy Lafuente (stronk7)
2ed28439f6
Merge branch 'MDL-28976' of git://github.com/timhunt/moodle
2011-08-24 12:57:16 +02:00
Petr Skoda
b5ae095d91
MDL-28929 add version.php with requirements and copyrights
...
The data for missing copyrights was taken from other files in the same theme, git history or plugins database.
2011-08-24 10:50:22 +02:00
Aparup Banerjee
efdbbafdba
Revert "MDL-28509 repository_youtube Enable selection of sort order"
...
This reverts commit 88bf951aa7
.
2011-08-24 14:39:46 +08:00
Eloy Lafuente (stronk7)
a2e87acfc5
Merge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle
2011-08-24 03:50:41 +02:00
Eloy Lafuente (stronk7)
a7493463d1
Merge branch 'MDL-28248b' of https://github.com/totara/moodle
2011-08-24 03:39:23 +02:00
Aaron Barnes
b58f4df6ea
MDL-28248 completion: Incorrect SQL for finding enrol start date
2011-08-24 12:05:34 +12:00
Eloy Lafuente (stronk7)
55cbc63882
Merge branch 'MDL-28979' of git://github.com/timhunt/moodle
2011-08-24 01:55:45 +02:00
Tim Hunt
a980739fd4
MDL-28942 qtype multichoice, multi-response. Avoid computing the wrong random guess score.
...
It is effectively impossible to compute the right random guess score, so we should not compute anything, rather than computing a number that we know is wrong.
This patch also fixes a multianswer unit test error that was shown up by this fix.
2011-08-24 01:52:28 +02:00
Eloy Lafuente (stronk7)
64ce7fb6c5
Merge branch 'MDL-28975' of git://github.com/timhunt/moodle
2011-08-24 01:44:02 +02:00
Sun Zhigang
c03ae03383
MDL-29019 enrol - fix a typo
2011-08-24 01:30:57 +02:00
Eloy Lafuente (stronk7)
f622fbef7f
Merge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle
2011-08-24 01:17:28 +02:00
Eloy Lafuente (stronk7)
5f37fcf861
Merge branch 'w33_MDL-29000_m22_forgetcase' of git://github.com/skodak/moodle
2011-08-24 00:56:46 +02:00
Eloy Lafuente (stronk7)
c8f74cc628
Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle
2011-08-24 00:52:56 +02:00
Eloy Lafuente (stronk7)
de1c2d8322
Merge branch 'w33_MDL-27228_m22_labelhide' of git://github.com/skodak/moodle
2011-08-23 23:35:41 +02:00
Eloy Lafuente (stronk7)
df12713415
Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle
2011-08-23 23:26:06 +02:00
Eloy Lafuente (stronk7)
94fd5ebc06
Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle
2011-08-23 23:16:29 +02:00
Eloy Lafuente (stronk7)
3a6cd081e4
Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle
2011-08-23 23:12:34 +02:00
Eloy Lafuente (stronk7)
d12d4d59a6
MDL-28684 QE2 upgrade: whitespace fix
2011-08-23 22:52:16 +02:00
Eloy Lafuente (stronk7)
a4a6279a61
Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle
2011-08-23 22:50:03 +02:00
Eloy Lafuente (stronk7)
53ef01d00b
Merge branch 'MDL-28444' of git://github.com/timhunt/moodle
2011-08-23 22:46:17 +02:00
Aparup Banerjee
553d343bf2
Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle
2011-08-24 03:03:50 +08:00
Aparup Banerjee
5ad0103d9d
Merge branch 'MDL-28687' of git://github.com/timhunt/moodle
2011-08-24 02:24:08 +08:00
Eloy Lafuente (stronk7)
379771a723
Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
2011-08-23 19:04:44 +02:00
Eloy Lafuente (stronk7)
fb57247ed2
MDL-28962 enrol imsenterprise - whitespace fix
2011-08-23 18:39:48 +02:00
Eloy Lafuente (stronk7)
4a88ad2f2a
Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
2011-08-23 18:31:01 +02:00
Eloy Lafuente (stronk7)
8d30b1a97e
Merge branch 'MDL-28957' of git://github.com/colchambers/moodle
2011-08-23 18:00:51 +02:00
Eloy Lafuente (stronk7)
01fc285579
Merge branch 'MDL-28397' of https://github.com/totara/moodle
2011-08-23 17:17:16 +02:00
Petr Skoda
a7a20faf8f
MDL-29027 fallback to mb_string on errors if available and simplify charset parsing
...
This may solve problems with encodings unsupported in iconv and random borked chars are ignored.
2011-08-23 15:21:15 +02:00
Aparup Banerjee
31d13687c9
Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
2011-08-23 18:17:26 +08:00
Eloy Lafuente (stronk7)
065399a11f
Merge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/moodle
2011-08-23 11:03:19 +02:00
Eloy Lafuente (stronk7)
4abd7a07e1
Merge branch 'MDL-28996' of git://github.com/timhunt/moodle
2011-08-23 10:41:17 +02:00
Eloy Lafuente (stronk7)
6c29e785eb
Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle
2011-08-23 10:11:41 +02:00
Eloy Lafuente (stronk7)
f1bb5b2ec7
Merge branch 'w33_MDL-28935_m22_calendardays' of git://github.com/skodak/moodle
2011-08-23 09:59:27 +02:00
Petr Skoda
ebdeccca4e
MDL-26796 remove unused param
2011-08-23 08:18:03 +02:00
Aparup Banerjee
f3d8c8a9a3
Merge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle
2011-08-23 14:07:08 +08:00
Eloy Lafuente (stronk7)
c946644435
Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle
2011-08-23 02:49:40 +02:00
Eloy Lafuente (stronk7)
906f11ef3b
Merge branch 'w33_MDL-29016_m22_distropermissions' of git://github.com/skodak/moodle
2011-08-23 02:42:40 +02:00
Eloy Lafuente (stronk7)
1a3c27d0b6
Merge branch 'MDL-28990' of git://github.com/mouneyrac/moodle
2011-08-23 02:35:05 +02:00
Eloy Lafuente (stronk7)
865b0b1437
Merge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle
2011-08-23 02:03:19 +02:00