moodle.git
9 years agoMerge branch 'MDL-29226' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Thu, 24 Nov 2011 06:39:53 +0000 (14:39 +0800)]
Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 22:01:27 +0000 (23:01 +0100)]
Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle

9 years agoMDL-29450 improve and cleanup course content removal
Petr Skoda [Wed, 9 Nov 2011 09:43:10 +0000 (10:43 +0100)]
MDL-29450 improve and cleanup course content removal

New keep roles/enrolments and groups/groupings options, notification CSS fixed, standardised notification texts, added missing delete of module blocks, fixed file deleting and some other minor issues.

9 years agoMerge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:37:37 +0000 (13:37 +0100)]
Merge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:33:39 +0000 (13:33 +0100)]
Merge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'wip-mdl-30375' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:28:24 +0000 (13:28 +0100)]
Merge branch 'wip-mdl-30375' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:19:21 +0000 (13:19 +0100)]
Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:16:04 +0000 (13:16 +0100)]
Merge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-29095' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)]
Merge branch 'MDL-29095' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29060' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:47:51 +0000 (11:47 +0100)]
Merge branch 'MDL-29060' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-mdl-28947' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:37:34 +0000 (11:37 +0100)]
Merge branch 'wip-mdl-28947' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)]
Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:07:50 +0000 (11:07 +0100)]
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 23 Nov 2011 06:34:34 +0000 (14:34 +0800)]
Merge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle

9 years agoMDL-29995 Filters - added MDL issue number to Todo.
Aparup Banerjee [Wed, 23 Nov 2011 05:51:11 +0000 (13:51 +0800)]
MDL-29995 Filters - added MDL issue number to Todo.

9 years agoMerge branch 'MDL-29995' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 23 Nov 2011 05:47:52 +0000 (13:47 +0800)]
Merge branch 'MDL-29995' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle
Aparup Banerjee [Wed, 23 Nov 2011 04:36:35 +0000 (12:36 +0800)]
Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle

9 years agoMerge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle
Aparup Banerjee [Wed, 23 Nov 2011 04:06:58 +0000 (12:06 +0800)]
Merge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng...
Sam Hemelryk [Wed, 23 Nov 2011 03:52:08 +0000 (16:52 +1300)]
Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle

9 years agoMDL-30335 formslib : phpdoc improvement
Aparup Banerjee [Wed, 23 Nov 2011 03:47:06 +0000 (11:47 +0800)]
MDL-30335 formslib : phpdoc improvement

9 years agoMerge branch 'MDL-30335' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 23 Nov 2011 03:41:58 +0000 (11:41 +0800)]
Merge branch 'MDL-30335' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Wed, 23 Nov 2011 03:12:03 +0000 (11:12 +0800)]
Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle

9 years agoMDL-29778 Fix to make user selector arrow visible
Mary Evans [Wed, 9 Nov 2011 17:39:30 +0000 (17:39 +0000)]
MDL-29778 Fix to make user selector arrow visible

9 years agoMDL-29830 theme_base: Fix overflow problems with navigation items
Kordan [Thu, 10 Nov 2011 07:03:27 +0000 (08:03 +0100)]
MDL-29830 theme_base: Fix overflow problems with navigation items

9 years agoMDL-30375 Blocks: Comments block will show blank textbox rather then hiding and ...
Rajesh Taneja [Tue, 22 Nov 2011 07:25:09 +0000 (15:25 +0800)]
MDL-30375 Blocks: Comments block will show blank textbox rather then hiding and 'add a comment' will be visible if it's empty

9 years agoMerge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 02:06:18 +0000 (03:06 +0100)]
Merge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-27045' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 02:01:50 +0000 (03:01 +0100)]
Merge branch 'MDL-27045' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30192' of git://github.com/stronk7/moodle
Sam Hemelryk [Wed, 23 Nov 2011 01:11:23 +0000 (14:11 +1300)]
Merge branch 'MDL-30192' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 01:00:53 +0000 (02:00 +0100)]
Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)]
Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)]
Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:20:39 +0000 (01:20 +0100)]
Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-30306b' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:18:00 +0000 (01:18 +0100)]
Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:11:01 +0000 (01:11 +0100)]
Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:07:44 +0000 (01:07 +0100)]
Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:04:29 +0000 (01:04 +0100)]
Merge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle

9 years agoMDL-30164 FIX for missing gap between icon and text in reports
Mary Evans [Wed, 9 Nov 2011 00:32:16 +0000 (00:32 +0000)]
MDL-30164 FIX for missing gap between icon and text in reports

9 years agoMDL-30196 changed reference from Serenity to Sky High in theme_sky_high.php
Mary Evans [Sun, 13 Nov 2011 17:19:56 +0000 (17:19 +0000)]
MDL-30196 changed reference from Serenity to Sky High in theme_sky_high.php

9 years agoMerge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2
Sam Hemelryk [Tue, 22 Nov 2011 23:41:24 +0000 (12:41 +1300)]
Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2

9 years agoMerge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 22 Nov 2011 23:17:14 +0000 (12:17 +1300)]
Merge branch 'w46_MDL-30303_m22_mimeinfo' of git://github.com/skodak/moodle

9 years agoMerge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 22 Nov 2011 21:57:38 +0000 (10:57 +1300)]
Merge branch 'w46_MDL-30403_m22_upgradedocs' of git://github.com/skodak/moodle

9 years agoMDL-30409 moodlelib syntax errors 'throw coding_exception'
sam marshall [Tue, 22 Nov 2011 16:33:23 +0000 (16:33 +0000)]
MDL-30409 moodlelib syntax errors 'throw coding_exception'

9 years agoMDL-30390 Advanced grading - fixed the database table field name in the restore
David Mudrak [Tue, 22 Nov 2011 14:50:17 +0000 (15:50 +0100)]
MDL-30390 Advanced grading - fixed the database table field name in the restore

This is a regression of the recent fields renaming.

9 years agoMDL-30404 All Moodle caches can be now purged from CLI
David Mudrak [Tue, 22 Nov 2011 10:50:54 +0000 (11:50 +0100)]
MDL-30404 All Moodle caches can be now purged from CLI

9 years agoMDL-30404 Ability to manually purge string caches from the language packs import...
David Mudrak [Tue, 22 Nov 2011 10:37:36 +0000 (11:37 +0100)]
MDL-30404 Ability to manually purge string caches from the language packs import utility

9 years agoMDL-30403 add upgrade docs for admin tools
Petr Skoda [Tue, 22 Nov 2011 10:02:30 +0000 (11:02 +0100)]
MDL-30403 add upgrade docs for admin tools

9 years agoMDL-30403 improve upgrade docs for general reports
Petr Skoda [Tue, 22 Nov 2011 10:02:13 +0000 (11:02 +0100)]
MDL-30403 improve upgrade docs for general reports

9 years agoMerge branch 'MDL-30397' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Nov 2011 09:16:27 +0000 (17:16 +0800)]
Merge branch 'MDL-30397' of git://github.com/timhunt/moodle

9 years agoMDL-30402 Removing hard-coded English string from the CLI installer
David Mudrak [Tue, 22 Nov 2011 09:02:42 +0000 (10:02 +0100)]
MDL-30402 Removing hard-coded English string from the CLI installer

9 years agoMDL-30398 Validations added for password field
Ankit Kumar Agarwal [Tue, 22 Nov 2011 08:53:05 +0000 (14:23 +0530)]
MDL-30398 Validations added for password field

9 years agoMerge branch 'MDL-30185' of git://github.com/colchambers/moodle
Aparup Banerjee [Tue, 22 Nov 2011 08:26:29 +0000 (16:26 +0800)]
Merge branch 'MDL-30185' of git://github.com/colchambers/moodle

9 years agoMerge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 22 Nov 2011 08:08:57 +0000 (16:08 +0800)]
Merge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-29396 core: ip blocking will be bypassed for cli scripts - Thanks Petr
Rajesh Taneja [Mon, 14 Nov 2011 02:09:10 +0000 (10:09 +0800)]
MDL-29396 core: ip blocking will be bypassed for cli scripts - Thanks Petr

9 years agoMerge branch 'MDL-27735' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 22 Nov 2011 07:28:17 +0000 (15:28 +0800)]
Merge branch 'MDL-27735' of git://github.com/rwijaya/moodle

9 years agoMDL-27735 Q&A forum: add new caps to add question. By default, teacher, editing teach...
Rossiani Wijaya [Tue, 22 Nov 2011 07:26:44 +0000 (15:26 +0800)]
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

9 years agoMDL-30397 qformat_xml::format() should be public.
Tim Hunt [Tue, 22 Nov 2011 07:21:04 +0000 (07:21 +0000)]
MDL-30397 qformat_xml::format() should be public.

9 years agoMerge branch 'MDL-27703_user_report_sql' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 22 Nov 2011 05:48:24 +0000 (13:48 +0800)]
Merge branch 'MDL-27703_user_report_sql' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-28629' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 22 Nov 2011 05:26:35 +0000 (18:26 +1300)]
Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle

9 years agoMDL-30393 lib/bennu minor fixes for RFC-2445 and PHP 5.x support.
Jonathan Harker [Mon, 21 Nov 2011 23:53:01 +0000 (12:53 +1300)]
MDL-30393 lib/bennu minor fixes for RFC-2445 and PHP 5.x support.

9 years agoMDL-30394 Backup: Removed popup, inserted by 27790 during restore in new course
Rajesh Taneja [Tue, 22 Nov 2011 04:03:26 +0000 (12:03 +0800)]
MDL-30394 Backup: Removed popup, inserted by 27790 during restore in new course

9 years agoMerge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 22 Nov 2011 03:33:55 +0000 (11:33 +0800)]
Merge branch 'w46_MDL-30349_m22_filestatcaching' of git://github.com/skodak/moodle

9 years agoMDL-28947 lib: print_object cleans html special chars before printing
Rajesh Taneja [Mon, 7 Nov 2011 07:18:32 +0000 (15:18 +0800)]
MDL-28947 lib: print_object cleans html special chars before printing

9 years agoon-demand release 2.2beta+
Eloy Lafuente (stronk7) [Tue, 22 Nov 2011 00:51:50 +0000 (01:51 +0100)]
on-demand release 2.2beta+

9 years agofix permissions
Eloy Lafuente (stronk7) [Tue, 22 Nov 2011 00:51:06 +0000 (01:51 +0100)]
fix permissions

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Tue, 22 Nov 2011 00:50:20 +0000 (01:50 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 22 Nov 2011 00:30:48 +0000 (00:30 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-30392' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 21 Nov 2011 23:59:19 +0000 (12:59 +1300)]
Merge branch 'MDL-30392' of git://github.com/stronk7/moodle

9 years agoMDL-30392 DML - Fix old-style delete_records() call
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 23:41:05 +0000 (00:41 +0100)]
MDL-30392 DML - Fix old-style delete_records() call

9 years agoMDL-30381 install_init_dataroot() now creates temp and cache
David Mudrak [Mon, 21 Nov 2011 15:49:40 +0000 (16:49 +0100)]
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.

9 years agoMDL-30270 rubric Cleaned up minor points after review before integration
Sam Hemelryk [Mon, 21 Nov 2011 21:40:15 +0000 (10:40 +1300)]
MDL-30270 rubric Cleaned up minor points after review before integration

9 years agoMerge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 21 Nov 2011 21:39:02 +0000 (10:39 +1300)]
Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'mdl-23006-xmldb-missing-strings' of git://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 18:42:20 +0000 (19:42 +0100)]
Merge branch 'mdl-23006-xmldb-missing-strings' of git://github.com/sbourget/moodle

9 years agoMDL-30174 Assignment : Only increment submission offset if the current assignment...
Andrew Robert Nicols [Mon, 7 Nov 2011 17:35:12 +0000 (17:35 +0000)]
MDL-30174 Assignment : Only increment submission offset if the current assignment was not saved

9 years agoMDL-30173 Assignment : Convert to use moodle_url and add missing filter param
Andrew Robert Nicols [Mon, 7 Nov 2011 17:28:39 +0000 (17:28 +0000)]
MDL-30173 Assignment : Convert to use moodle_url and add missing filter param

9 years agoMerge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Mon, 21 Nov 2011 17:15:26 +0000 (01:15 +0800)]
Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle

9 years agoMDL-30344 lti - whitespace & comments cleanup
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 15:59:58 +0000 (16:59 +0100)]
MDL-30344 lti - whitespace & comments cleanup

9 years agoMDL-30344 lti - Hiding roster permission from the UI as it's not implemented in LTI...
Chris Scribner [Fri, 18 Nov 2011 00:07:36 +0000 (19:07 -0500)]
MDL-30344 lti - Hiding roster permission from the UI as it's not implemented in LTI 1.1.

9 years agoMDL-30344 lti - Fix issue with privacy settings not working for a course level tool...
Chris Scribner [Fri, 18 Nov 2011 00:02:04 +0000 (19:02 -0500)]
MDL-30344 lti - Fix issue with privacy settings not working for a course level tool if no Launch URL is specified.

9 years agoMDL-20534 lti: Updating privacy settings dynamically based on matched Launch URL.
Chris Scribner [Wed, 16 Nov 2011 20:49:57 +0000 (15:49 -0500)]
MDL-20534 lti: Updating privacy settings dynamically based on matched Launch URL.

9 years agoMDL-30381 Fixed the tempdir and cachedir value calculation
David Mudrak [Mon, 21 Nov 2011 15:01:18 +0000 (16:01 +0100)]
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.

9 years agoMDL-30381 Fixed path to the cache directory in installers
David Mudrak [Mon, 21 Nov 2011 10:49:51 +0000 (11:49 +0100)]
MDL-30381 Fixed path to the cache directory in installers

This fixes the patch f848c0f6e60c4451a0058d87194f326bca690c1e introduced
in MDL-29351.

9 years agoMDL-30268 Web service : resolved version number conflict
Aparup Banerjee [Mon, 21 Nov 2011 06:47:23 +0000 (14:47 +0800)]
MDL-30268 Web service : resolved version number conflict

9 years agoMerge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Mon, 21 Nov 2011 05:57:34 +0000 (13:57 +0800)]
Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 21 Nov 2011 03:28:27 +0000 (11:28 +0800)]
Merge branch 'w46_MDL-21617_m22_xhack' of git://github.com/skodak/moodle

9 years agoMerge branch 'w46_MDL-30147_m22_tablenotexists' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 01:30:19 +0000 (02:30 +0100)]
Merge branch 'w46_MDL-30147_m22_tablenotexists' of git://github.com/skodak/moodle

9 years agoMDL-30328 some whitespace changes
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 01:23:51 +0000 (02:23 +0100)]
MDL-30328 some whitespace changes

9 years agoMerge branch 'MDL-30328' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 01:22:40 +0000 (02:22 +0100)]
Merge branch 'MDL-30328' of git://github.com/scriby/moodle

9 years agoMerge branch 'MDL-30326' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 01:03:51 +0000 (02:03 +0100)]
Merge branch 'MDL-30326' of git://github.com/scriby/moodle

9 years agoMDL-30289 forum - set page context when pruning a discussion
Charles Fulton [Wed, 16 Nov 2011 02:18:40 +0000 (18:18 -0800)]
MDL-30289 forum - set page context when pruning a discussion

9 years agoMDL-30354 lti - whitespace fixes
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:57:24 +0000 (01:57 +0100)]
MDL-30354 lti - whitespace fixes

9 years agoMerge branch 'MDL-30354' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:48:52 +0000 (01:48 +0100)]
Merge branch 'MDL-30354' of git://github.com/scriby/moodle

9 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:45:37 +0000 (01:45 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration

9 years agoMerge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Nov 2011 00:32:55 +0000 (13:32 +1300)]
Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle

9 years agoMDL-20534 lti: B9 - mini bump
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:27:34 +0000 (01:27 +0100)]
MDL-20534 lti: B9 - mini bump

9 years agoMDL-30236 removed outlawed javasript from theme_anomaly
Mary Evans [Sat, 12 Nov 2011 02:51:48 +0000 (02:51 +0000)]
MDL-30236 removed outlawed javasript from theme_anomaly

9 years agoMerge branch 'MDL-30343' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:17:06 +0000 (01:17 +0100)]
Merge branch 'MDL-30343' of git://github.com/scriby/moodle

9 years agoMerge branch 'MDL-30341' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:11:54 +0000 (01:11 +0100)]
Merge branch 'MDL-30341' of git://github.com/scriby/moodle

9 years agoMDL-30339 lti lang - whitespace fixes
Eloy Lafuente (stronk7) [Mon, 21 Nov 2011 00:03:22 +0000 (01:03 +0100)]
MDL-30339 lti lang - whitespace fixes

9 years agoMerge branch 'MDL-30295' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)]
Merge branch 'MDL-30295' of git://github.com/scriby/moodle

Conflicts:
mod/lti/lang/en/lti.php

9 years agoMerge branch 'MDL-30339' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Sun, 20 Nov 2011 23:50:32 +0000 (00:50 +0100)]
Merge branch 'MDL-30339' of git://github.com/scriby/moodle