48757 Commits

Author SHA1 Message Date
Sam Hemelryk
b1251c9008 Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle 2011-08-08 10:46:41 +08:00
Sam Hemelryk
cb09753feb Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle 2011-08-08 10:26:20 +08:00
Sam Hemelryk
9be161c678 Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle 2011-08-08 10:20:15 +08:00
Sam Hemelryk
7d85a4e226 Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements 2011-08-08 10:16:23 +08:00
Sam Hemelryk
3b8502658f Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle 2011-08-08 10:09:31 +08:00
Sam Hemelryk
406bf830cd Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle 2011-08-08 10:06:06 +08:00
Sam Hemelryk
7d405fe7c8 Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle 2011-08-08 09:59:42 +08:00
Sam Hemelryk
639ab4d5c5 Merge branch 'w31_MDL-28622_m22_userdel' of git://github.com/skodak/moodle 2011-08-08 09:57:11 +08:00
Sam Hemelryk
c357b5c6e0 Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle 2011-08-08 09:50:33 +08:00
Petr Skoda
37c8259280 MDL-28382 work around or detect REQUEST_URI IIS bug 2011-08-07 14:39:45 +02:00
Petr Skoda
d5b3deecba MDL-27685 fix pg LIKE escape trouble 2011-08-07 13:19:02 +02:00
Petr Skoda
c160da9cb8 MDL-28450 prefer member group for default 2011-08-07 13:06:45 +02:00
Petr Skoda
695940df3b MDL-28412 detect broken iconv 2011-08-06 23:04:31 +02:00
Petr Skoda
eab044a083 MDL-28634 fix forgotten references to Moodle 2.0 and old PHP version requirements 2011-08-06 23:00:02 +02:00
Petr Skoda
988fc20eef MDL-28630 prevent session breakage caused by incorrect cookie settings 2011-08-06 22:22:52 +02:00
Petr Skoda
f6b07c4da5 MDL-27586 fix file_browser access control 2011-08-06 15:45:18 +02:00
Petr Skoda
79cfcd3f7d MDL-28473 fix $instanceids troubles in blocks upgrade
Credit goes to Mateusz Wójcik.
2011-08-05 22:08:58 +02:00
Petr Skoda
50584dd3cc MDL-28468 fix cohort assign check 2011-08-05 21:43:29 +02:00
Petr Skoda
f9fd10e0be MDL-17477 improve session purging when deleting users 2011-08-05 19:47:54 +02:00
Petr Skoda
3fdc622697 weekly release 2.2dev 2011-08-03 18:07:11 +02:00
Sam Hemelryk
984915afe5 Revert "MDL-28284 don't load filepicker module for every page"
This reverts commit 9b0843c121d7ece498bdcd3a279e247c7f6f6abf.
2011-08-03 18:20:01 +08:00
Sam Hemelryk
948ef5d07a Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle 2011-08-03 15:03:30 +08:00
Petr Skoda
92f97e8253 Merge branch 'master_MDL-28493' 2011-08-03 08:27:52 +02:00
Dan Marsden
894dbd0420 MDL-28493 - fix version in upgrade - thanks Andrew 2011-08-03 15:36:52 +12:00
Petr Skoda
affce0d744 Merge branch 'MDL-28471' of git://github.com/timhunt/moodle 2011-08-02 16:35:09 +02:00
Tim Hunt
e6541b37e4 MDL-28471 better question flag icons.
Transparent background, and higher contrast for better accessibility.
2011-08-02 15:29:39 +01:00
Petr Skoda
1f5be6fbcd Merge branch 'master_MDL-10707' 2011-08-02 15:59:42 +02:00
Petr Skoda
6179c38af5 Merge branch 'wip-MDL-23626-master' of git://github.com/samhemelryk/moodle 2011-08-02 15:48:20 +02:00
Sam Hemelryk
ad4700977a MDL-26477 Added a setting to display course sections as links within the navigation 2011-08-02 15:24:59 +02:00
Petr Skoda
4a47631fb4 Merge branch 'wip-mdl-27658' of git://github.com/rajeshtaneja/moodle 2011-08-02 15:11:42 +02:00
Petr Skoda
58f9006970 Merge branch 'MDL-28338' of git://github.com/timhunt/moodle 2011-08-02 15:08:05 +02:00
Petr Skoda
411b2e1d8d Merge branch 'master_MDL-28410' 2011-08-02 15:01:15 +02:00
Petr Skoda
74b0ad6a4d Merge branch 'MDL-28471' of git://github.com/timhunt/moodle 2011-08-02 14:55:18 +02:00
Petr Skoda
48fa0c75b5 Merge branch 'MDL-28507' of git://github.com/timhunt/moodle 2011-08-02 14:50:41 +02:00
Petr Skoda
82b8e88418 Merge branch 'master_MDL-28535' 2011-08-02 14:35:21 +02:00
Petr Skoda
c03b42f521 Merge branch 'master_MDL-28542' 2011-08-02 14:30:20 +02:00
Tim Hunt
35ddcfb854 MDL-28507 fix bad lang string uses, and remove two obsolete strings. 2011-08-02 13:13:01 +01:00
Sam Hemelryk
44506b87dc Merge branch 'MDL-28490' of git://github.com/timhunt/moodle 2011-08-02 17:55:21 +08:00
Sam Hemelryk
58e67f7f1a Merge branch 'MDL-28508' of git://github.com/timhunt/moodle 2011-08-02 17:48:02 +08:00
Sam Hemelryk
87573744e6 Merge branch 'MDL-28051' of git://github.com/timhunt/moodle 2011-08-02 17:14:04 +08:00
Sam Hemelryk
1eaeb5d89e Merge branch 'MDL-28515' of git://git.luns.net.uk/moodle 2011-08-02 17:06:56 +08:00
Sam Hemelryk
6b50af32d6 Merge branch 'MDL-28340_advanced_search_other_users' of git://github.com/andyjdavis/moodle 2011-08-02 16:59:55 +08:00
Sam Hemelryk
a338b06243 Merge branch 'wip-mdl-28504' of git://github.com/rajeshtaneja/moodle 2011-08-02 16:50:58 +08:00
Sam Hemelryk
fef0f0e793 Merge branch 'wip-MDL-19907-master' of git://github.com/marinaglancy/moodle 2011-08-02 16:46:39 +08:00
Sam Hemelryk
dcaec029ec MDL-27122 admin Improved block protection help string 2011-08-02 16:23:45 +08:00
Sam Hemelryk
8a5d0e95b3 Merge branch 'wip-MDL-27122-master' of git://github.com/marinaglancy/moodle 2011-08-02 16:19:08 +08:00
Sam Hemelryk
5867cf5047 Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle 2011-08-02 14:08:31 +08:00
Sam Hemelryk
223b96e0fd Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng/moodle 2011-08-02 13:42:44 +08:00
Mark Johnson
b1fc521ff2 MDL-28510 repository_youtube Use smaller thumbnails in search results 2011-08-02 13:36:45 +08:00
unknown
16321a2bef Merge branch 'master_MDL-27876' of git://github.com/danmarsden/moodle 2011-08-02 13:25:44 +08:00