Aparup Banerjee
3a9e6be55a
Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle
2011-11-22 11:33:55 +08:00
Rajesh Taneja
187672608e
MDL-28947 lib: print_object cleans html special chars before printing
2011-11-22 09:28:54 +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 f848c0f6e60c4451a0058d87194f326bca690c1e introduced
in MDL-29351.
2011-11-21 15:48:31 +01:00
Aparup Banerjee
3a59d04c65
MDL-30268 Web service : resolved version number conflict
2011-11-21 14:47:23 +08:00
Aparup Banerjee
9dc97097b1
Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle
2011-11-21 13:57:34 +08:00
Aparup Banerjee
338b9cab83
Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle
2011-11-21 11:28:27 +08:00
Eloy Lafuente (stronk7)
6b532f5d4d
Merge branch 'w46_MDL-30147_m22_tablenotexists' of git://github.com/skodak/moodle
2011-11-21 02:30:19 +01:00
Eloy Lafuente (stronk7)
feeb52949f
MDL-30328 some whitespace changes
2011-11-21 02:23:51 +01:00
Eloy Lafuente (stronk7)
27e5ce8b9f
Merge branch 'MDL-30328' of git://github.com/scriby/moodle
2011-11-21 02:22:40 +01:00
Eloy Lafuente (stronk7)
e5235e6eef
Merge branch 'MDL-30326' of git://github.com/scriby/moodle
2011-11-21 02:03:51 +01:00
Charles Fulton
6737aae6bb
MDL-30289 forum - set page context when pruning a discussion
2011-11-21 08:58:26 +08:00
Eloy Lafuente (stronk7)
5f72d1025b
MDL-30354 lti - whitespace fixes
2011-11-21 01:57:24 +01:00
Eloy Lafuente (stronk7)
d167cc3397
Merge branch 'MDL-30354' of git://github.com/scriby/moodle
2011-11-21 01:48:52 +01:00
Eloy Lafuente (stronk7)
eba4bcb441
Merge branch 'master' of git.moodle.org:/git/integration
2011-11-21 01:45:37 +01:00
Sam Hemelryk
919423fc6c
Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle
2011-11-21 13:32:55 +13:00
Mary Evans
c6185e2eac
MDL-30243 Added configtitle to theme_afternburner
2011-11-21 00:31:39 +00:00
Eloy Lafuente (stronk7)
77a7978f11
MDL-20534 lti: B9 - mini bump
2011-11-21 01:27:34 +01:00
Mary Evans
6ee5f11511
MDL-30236 removed outlawed javasript from theme_anomaly
2011-11-21 13:27:22 +13:00
Eloy Lafuente (stronk7)
695f327a70
Merge branch 'MDL-30343' of git://github.com/scriby/moodle
2011-11-21 01:17:06 +01:00
Eloy Lafuente (stronk7)
0fca3dbbce
Merge branch 'MDL-30341' of git://github.com/scriby/moodle
2011-11-21 01:11:54 +01:00
Eloy Lafuente (stronk7)
253f5575c9
MDL-30339 lti lang - whitespace fixes
2011-11-21 01:03:22 +01:00
Eloy Lafuente (stronk7)
8efcee5f8c
Merge branch 'MDL-30295' of git://github.com/scriby/moodle
...
Conflicts:
mod/lti/lang/en/lti.php
2011-11-21 00:58:12 +01:00
Eloy Lafuente (stronk7)
34087d7be2
Merge branch 'MDL-30339' of git://github.com/scriby/moodle
2011-11-21 00:50:32 +01:00
Sam Hemelryk
28e6598dff
Merge branch 'w46_MDL-30294_m22_errorsinthemefiles' of git://github.com/skodak/moodle
2011-11-21 12:48:06 +13:00
Sam Hemelryk
67c768dbe8
Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle
2011-11-21 12:39:42 +13:00
Sam Hemelryk
4f0596f874
Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle
2011-11-21 12:23:32 +13:00
Sam Hemelryk
291029dfd5
Merge branch 'MDL-30309' of git://github.com/lazydaisy/moodle
2011-11-21 12:01:45 +13:00
Sam Hemelryk
34e05996c1
Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle
2011-11-21 11:53:45 +13:00
Sam Hemelryk
b8c117e126
Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle
2011-11-21 11:48:47 +13:00
Sam Hemelryk
eb3217dc40
MDL-30359 theme_base Fixed regression with course completion icons
2011-11-21 11:30:17 +13:00
Sam Hemelryk
7cdf3904a7
Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle
2011-11-21 10:28:32 +13:00
Mary Evans
98dd8e72e9
MDL-29904-master FIX to add pagelayout=>report
2011-11-20 18:58:49 +00:00
