49804 Commits

Author SHA1 Message Date
AMOS bot
4384a6805b Automatically generated installer lang files 2011-11-04 00:55:28 +00:00
AMOS bot
5b82b2d827 Automatically generated installer lang files 2011-11-03 00:55:24 +00:00
Eloy Lafuente (stronk7)
735de1c276 weekly release 2.2dev 2011-11-02 19:52:31 +01:00
Eloy Lafuente (stronk7)
77c5a59017 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-11-02 19:48:26 +01:00
Eloy Lafuente (stronk7)
799be36820 MDL-29213 - add clarification note + todo once MDL-30039 arrives 2011-11-02 19:07:52 +01:00
Eloy Lafuente (stronk7)
5fbf87c802 Merge branch 'MDL-29879' of git://github.com/timhunt/moodle 2011-11-01 20:12:45 +01:00
Eloy Lafuente (stronk7)
313e048981 MDL-29283 import TCPDF to 5.9.133 - clean whitespace 2011-11-01 20:09:10 +01:00
Dan Marsden
a5ba44f93c MDL-29213 - fix for bug with flash player and IE 9
(cherry-picked and amended with 1-line whitespace)
2011-11-01 19:59:05 +01:00
Eloy Lafuente (stronk7)
e785b0f3ca MDL-29283 import TCPDF to 5.9.133 - fix permissions 2011-11-01 17:27:26 +01:00
Eloy Lafuente (stronk7)
e686d11257 Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle 2011-11-01 17:23:20 +01:00
Eloy Lafuente (stronk7)
302f45e8de Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle 2011-11-01 12:26:31 +01:00
Tim Hunt
78f8261f6e MDL-29879 qbehaviour missing. Fix bad lang string. 2011-11-01 10:37:48 +00:00
Aparup Banerjee
ddba89cc2a Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-11-01 15:18:44 +08:00
Petr Skoda
0775152ff0 MDL-30005 regression fix for non http/ftp urls 2011-11-01 07:56:33 +01:00
Aparup Banerjee
203683e415 Merge branch 'MDL-29983' of git://github.com/timhunt/moodle 2011-11-01 13:23:03 +08:00
Sam Hemelryk
21e7d4c5fc MDL-28720 calendar: Quick fix of a regression in set.php 2011-11-01 17:50:01 +13:00
Sam Hemelryk
f94d606f1f Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle 2011-11-01 17:36:50 +13:00
Aparup Banerjee
d29f4e055d Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle 2011-11-01 12:15:40 +08:00
Aparup Banerjee
b68c077632 Merge branch 'MDL-29787' of git://github.com/lazydaisy/moodle 2011-11-01 12:00:57 +08:00
Sam Hemelryk
5f3abf0a42 Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle 2011-11-01 16:52:02 +13:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
Sam Hemelryk
bc454be746 Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle 2011-11-01 16:11:58 +13:00
Sam Hemelryk
c189b664ae Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle 2011-11-01 15:56:55 +13:00
AMOS bot
98ab317bc7 Automatically generated installer lang files 2011-11-01 00:55:16 +00:00
Sam Hemelryk
5a866c3634 Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle 2011-11-01 09:38:24 +13:00
Tim Hunt
a49e92a4e9 MDL-29164 question import, missing lang string.
AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END
2011-10-31 15:35:07 +00:00
Aparup Banerjee
d1e82ba966 Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle 2011-10-31 17:19:14 +08:00
Aparup Banerjee
c84f4700ec Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle 2011-10-31 17:08:32 +08:00
Aparup Banerjee
ae44df3c43 Merge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle 2011-10-31 16:10:00 +08:00
Aparup Banerjee
c2c7d8715d Merge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle 2011-10-31 16:05:12 +08:00
Aparup Banerjee
b6d2f5b266 Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle 2011-10-31 15:25:55 +08:00
Aparup Banerjee
b2851c8ded MDL-30005 URL : fixed typos 2011-10-31 15:12:45 +08:00
Aparup Banerjee
2636126f89 Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle 2011-10-31 14:13:46 +08:00
Sam Hemelryk
703912cd5e Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle 2011-10-31 18:02:03 +13:00
Sam Hemelryk
d0464f3875 Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle 2011-10-31 17:59:11 +13:00
Sam Hemelryk
0b49b6daa7 Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle 2011-10-31 17:28:57 +13:00
Sam Hemelryk
5e255d5ad8 Merge branch 'MDL-27919' of git://github.com/jamiepratt/moodle 2011-10-31 17:18:13 +13:00
Sam Hemelryk
243e3dd130 Merge branch 'MDL-29810' of git://github.com/bostelm/moodle 2011-10-31 17:11:08 +13:00
Sam Hemelryk
1fe368530f Merge branch 'MDL-29994' of git://github.com/stronk7/moodle 2011-10-31 16:53:24 +13:00
Aparup Banerjee
046391ea11 Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle 2011-10-31 10:23:59 +08:00
Sam Hemelryk
70f43a4789 Merge branch 'MDL-29993' of git://github.com/stronk7/moodle 2011-10-31 15:19:31 +13:00
Sam Hemelryk
01dc193786 Merge branch 'MDL-29992' of git://github.com/stronk7/moodle 2011-10-31 14:56:06 +13:00
Mary Evans
ab9d5899b8 MDL-29197 FIX for content displacment when clicking anchor elements in course page 2011-10-31 01:43:17 +00:00
Sam Hemelryk
a6d832f022 Merge branch 'MDL-29978' of git://github.com/stronk7/moodle 2011-10-31 13:51:07 +13:00
Sam Hemelryk
cdf30a11a8 Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle 2011-10-31 13:06:10 +13:00
Sam Hemelryk
81ad059658 Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle 2011-10-31 12:59:35 +13:00
Sam Hemelryk
75dab90e3d Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle 2011-10-31 12:55:57 +13:00
Sam Hemelryk
ad7592f32b Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle 2011-10-31 12:47:21 +13:00
Sam Hemelryk
385f30f7a7 Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle 2011-10-31 12:44:05 +13:00
Petr Skoda
b615a0bf9a MDL-30005 bump up version after lang string change 2011-10-30 23:53:26 +01:00