Commit graph

50372 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
7722bb5df8 Merge branch 'MDL-27045' of git://github.com/timhunt/moodle 2011-11-23 03:01:50 +01:00
Sam Hemelryk
b8a2a92773 Merge branch 'MDL-30192' of git://github.com/stronk7/moodle 2011-11-23 14:11:23 +13:00
Eloy Lafuente (stronk7)
689461f4d8 Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle 2011-11-23 02:00:53 +01:00
Sam Hemelryk
ba54648b45 Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle 2011-11-23 13:54:26 +13:00
Eloy Lafuente (stronk7)
0f6cc7a7cc Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle 2011-11-23 01:44:49 +01:00
Eloy Lafuente (stronk7)
ea46fcbced Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle 2011-11-23 01:20:39 +01:00
Eloy Lafuente (stronk7)
1316fc8af9 Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle 2011-11-23 01:18:00 +01:00
Eloy Lafuente (stronk7)
8ea233e7ad Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle 2011-11-23 01:11:01 +01:00
Eloy Lafuente (stronk7)
7242b051ac Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle 2011-11-23 01:07:44 +01:00
Eloy Lafuente (stronk7)
c8a82fdbfe Merge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle 2011-11-23 01:04:29 +01:00
Mary Evans
b04ae8ad2b MDL-30164 FIX for missing gap between icon and text in reports 2011-11-23 12:59:04 +13:00
Mary Evans
6207bf8f05 MDL-30196 changed reference from Serenity to Sky High in theme_sky_high.php 2011-11-23 12:50:08 +13:00
Sam Hemelryk
f2d11739a8 Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2 2011-11-23 12:41:24 +13:00
Sam Hemelryk
b2d3e5cc49 Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle 2011-11-23 12:17:14 +13:00
Sam Hemelryk
15415bf8e8 Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle 2011-11-23 10:57:38 +13:00
David Mudrak
561d547173 MDL-30404 All Moodle caches can be now purged from CLI 2011-11-22 11:50:54 +01:00
David Mudrak
6dc2df50f9 MDL-30404 Ability to manually purge string caches from the language packs import utility 2011-11-22 11:37:36 +01:00
Petr Skoda
d898238081 MDL-30403 add upgrade docs for admin tools 2011-11-22 11:02:30 +01:00
Petr Skoda
c2dbe006d0 MDL-30403 improve upgrade docs for general reports 2011-11-22 11:02:13 +01:00
Aparup Banerjee
e0e2db92a3 Merge branch 'MDL-30397' of git://github.com/timhunt/moodle 2011-11-22 17:16:27 +08:00
David Mudrak
6e17567624 MDL-30402 Removing hard-coded English string from the CLI installer 2011-11-22 10:02:42 +01:00
Aparup Banerjee
65fbaea13d Merge branch 'MDL-30185' of git://github.com/colchambers/moodle 2011-11-22 16:26:29 +08:00
Aparup Banerjee
525e45795a Merge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle 2011-11-22 16:08:57 +08:00
Rajesh Taneja
ade30ad3c4 MDL-29396 core: ip blocking will be bypassed for cli scripts - Thanks Petr 2011-11-22 16:02:02 +08:00
Aparup Banerjee
46fc365c77 Merge branch 'MDL-27735' of git://github.com/rwijaya/moodle 2011-11-22 15:28:17 +08:00
Rossiani Wijaya
db8312d23c MDL-27735 Q&A forum: add new caps to add question. By default, teacher, editing teacher and manager role has the capability to add new question 2011-11-22 15:26:44 +08:00
Tim Hunt
2ecbad416e MDL-30397 qformat_xml::format() should be public. 2011-11-22 07:21:04 +00:00
Aparup Banerjee
6aabd59e69 Merge branch 'MDL-27703_user_report_sql' of git://github.com/andyjdavis/moodle 2011-11-22 13:48:24 +08:00
Sam Hemelryk
b28de4b412 Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle 2011-11-22 18:26:35 +13:00
Jonathan Harker
95641b4529 MDL-30393 lib/bennu minor fixes for RFC-2445 and PHP 5.x support. 2011-11-22 17:26:49 +13:00
Aparup Banerjee
3a9e6be55a Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle 2011-11-22 11:33:55 +08:00
Eloy Lafuente (stronk7)
79b0fece1f on-demand release 2.2beta+ 2011-11-22 01:51:50 +01:00
Eloy Lafuente (stronk7)
df17785210 fix permissions 2011-11-22 01:51:06 +01:00
Eloy Lafuente (stronk7)
b8ba54a408 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-11-22 01:50:20 +01:00
AMOS bot
3370582b86 Automatically generated installer lang files 2011-11-22 00:30:48 +00:00
Sam Hemelryk
f5d0ac1077 Merge branch 'MDL-30392' of git://github.com/stronk7/moodle 2011-11-22 12:59:19 +13:00
Eloy Lafuente (stronk7)
08fa81d6c5 MDL-30392 DML - Fix old-style delete_records() call 2011-11-22 00:41:05 +01:00
David Mudrak
fbe33209ce MDL-30381 install_init_dataroot() now creates temp and cache
This prevents PHP warnings displayed due to recent modifications in
make_temp_dir() and make_cache_dir(). These functions now expect that
the root temp/cache dir already exists. So they must be available before
the lang_installer installs the lang pack during install.
2011-11-21 23:56:05 +01:00
Sam Hemelryk
009b14c065 MDL-30270 rubric Cleaned up minor points after review before integration 2011-11-22 10:40:15 +13:00
Sam Hemelryk
495bcb06d1 Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle 2011-11-22 10:39:02 +13:00
Eloy Lafuente (stronk7)
2b72f6dc62 Merge branch 'mdl-23006-xmldb-missing-strings' of git://github.com/sbourget/moodle 2011-11-21 19:42:20 +01:00
Andrew Robert Nicols
70eddb71cf MDL-30174 Assignment : Only increment submission offset if the current assignment was not saved 2011-11-22 02:20:16 +08:00
Andrew Robert Nicols
89a4471b97 MDL-30173 Assignment : Convert to use moodle_url and add missing filter param 2011-11-22 02:02:26 +08:00
Aparup Banerjee
85227804b4 Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle 2011-11-22 01:15:26 +08:00
Eloy Lafuente (stronk7)
7715c88d36 MDL-30344 lti - whitespace & comments cleanup 2011-11-21 16:59:58 +01:00
Chris Scribner
59fc5c5404 MDL-30344 lti - Hiding roster permission from the UI as it's not implemented in LTI 1.1. 2011-11-21 16:42:28 +01:00
Chris Scribner
038d8e30c3 MDL-30344 lti - Fix issue with privacy settings not working for a course level tool if no Launch URL is specified. 2011-11-21 16:42:12 +01:00
Chris Scribner
4c598b133f MDL-20534 lti: Updating privacy settings dynamically based on matched Launch URL. 2011-11-21 16:42:12 +01:00
David Mudrak
b907d3f58c MDL-30381 Fixed the tempdir and cachedir value calculation
Instead of using the default dataroot location, the tempdir and cachedir
are now set under the real dataroot location specified via the argument
and/or the interactive session.

The patch also adds a PARAM_PATH check for the dataroot specified.
2011-11-21 16:01:18 +01:00
David Mudrak
12812ad5da MDL-30381 Fixed path to the cache directory in installers
This fixes the patch f848c0f6e6 introduced
in MDL-29351.
2011-11-21 15:48:31 +01:00