moodle.git
9 years agoMerge branch 'MDL-32318' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 10 Apr 2012 02:26:49 +0000 (10:26 +0800)]
Merge branch 'MDL-32318' of git://github.com/timhunt/moodle

9 years agoMDL-32300 quiz reports: proper frankenstyle prefixes on class names.
Tim Hunt [Thu, 17 Nov 2011 18:34:07 +0000 (18:34 +0000)]
MDL-32300 quiz reports: proper frankenstyle prefixes on class names.

9 years agoMerge branch 'MDL-25801' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 10 Apr 2012 01:11:38 +0000 (09:11 +0800)]
Merge branch 'MDL-25801' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32349-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 10 Apr 2012 00:38:40 +0000 (12:38 +1200)]
Merge branch 'MDL-32349-master' of git://github.com/sammarshallou/moodle

9 years agoMDL-30843 admin: Fixed up label for attribute
Sam Hemelryk [Tue, 10 Apr 2012 00:35:26 +0000 (12:35 +1200)]
MDL-30843 admin: Fixed up label for attribute

9 years agoMerge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 10 Apr 2012 00:34:37 +0000 (12:34 +1200)]
Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)]
Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Apr 2012 22:48:34 +0000 (10:48 +1200)]
Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle

9 years agoMerge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Apr 2012 22:43:08 +0000 (10:43 +1200)]
Merge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle

9 years agoMerge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Apr 2012 22:37:45 +0000 (10:37 +1200)]
Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle

9 years agoMDL-32263 remove broken admin test in enrol_check_plugins()
Petr Skoda [Mon, 9 Apr 2012 17:59:19 +0000 (19:59 +0200)]
MDL-32263 remove broken admin test in enrol_check_plugins()

9 years agoMDL-32308 Fix error when testing id of guest user
Hugh Davenport [Mon, 9 Apr 2012 17:03:45 +0000 (19:03 +0200)]
MDL-32308 Fix error when testing id of guest user

9 years agoMDL-32293 move the upgrade_set_timeout() function to lib/upgradelib.php
Petr Skoda [Mon, 9 Apr 2012 16:14:27 +0000 (18:14 +0200)]
MDL-32293 move the upgrade_set_timeout() function to lib/upgradelib.php

Credit goes to Eloy Lafuente.

9 years agoMDL-32349 Installing can time out with large number of plugins
sam marshall [Thu, 5 Apr 2012 16:14:39 +0000 (17:14 +0100)]
MDL-32349 Installing can time out with large number of plugins

9 years agoMDL-32318 question preview: fix php stric syntax error
Tim Hunt [Tue, 3 Apr 2012 13:56:46 +0000 (14:56 +0100)]
MDL-32318 question preview: fix php stric syntax error

Also, cheating, and committing a whitespace fix in the same commit.

Conflicts:

question/engine/questionusage.php

9 years agoMDL-25801 quiz editing: fix inconsistent grade-related terminology
Tim Hunt [Mon, 2 Apr 2012 15:28:24 +0000 (16:28 +0100)]
MDL-25801 quiz editing: fix inconsistent grade-related terminology

AMOS BEGIN
 MOV [totalpointsx,mod_quiz],[totalmarksx,mod_quiz]
AMOS END

9 years agoMDL-32143 output lib: Add ability have override core icons in dataroot
Eric Merrill [Thu, 5 Apr 2012 12:50:16 +0000 (08:50 -0400)]
MDL-32143 output lib: Add ability have override core icons in dataroot

Searches dataroot/pix/ and dataroot/pix_plugins/type/plugin for icons
to override base install

9 years agoweekly release 2.3dev
Aparup Banerjee [Thu, 5 Apr 2012 08:39:52 +0000 (16:39 +0800)]
weekly release 2.3dev

9 years agofix permissions
Aparup Banerjee [Thu, 5 Apr 2012 08:36:10 +0000 (16:36 +0800)]
fix permissions

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Aparup Banerjee [Thu, 5 Apr 2012 08:19:27 +0000 (16:19 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-20438 pluginlib: Don't run update checker on install
Dan Poltawski [Wed, 4 Apr 2012 12:59:45 +0000 (20:59 +0800)]
MDL-20438 pluginlib: Don't run update checker on install

This is unlikely to be the long term solution and so MDL-32329 has been
created to address that

9 years agoMDL-32220 question import: readquestions arguments change
Dan Poltawski [Wed, 4 Apr 2012 06:40:35 +0000 (14:40 +0800)]
MDL-32220 question import: readquestions arguments change

Removed the context parameter for blackboard and blackboard_six formats.

This parameter was removed in 4d188926

9 years agoMerge branch 'wip-MDL-31631-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Wed, 4 Apr 2012 05:40:58 +0000 (13:40 +0800)]
Merge branch 'wip-MDL-31631-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-20438 Upgrade version number to triger /admin/ upgrade
Dan Poltawski [Tue, 3 Apr 2012 08:55:16 +0000 (16:55 +0800)]
MDL-20438 Upgrade version number to triger /admin/ upgrade

9 years agoMDL-20438 pluginlib: Fix trivial whitespace issues issues
Dan Poltawski [Wed, 4 Apr 2012 01:39:40 +0000 (09:39 +0800)]
MDL-20438 pluginlib: Fix trivial whitespace issues issues

Also fixed a comment typo I spotted whilst reviewing

9 years agoMerge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 4 Apr 2012 03:17:43 +0000 (11:17 +0800)]
Merge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32009 reverting changes as they break installation
Sam Hemelryk [Wed, 4 Apr 2012 02:37:37 +0000 (14:37 +1200)]
MDL-32009 reverting changes as they break installation

9 years agoMDL-32009 message: Small changes before integration
Sam Hemelryk [Wed, 4 Apr 2012 02:20:07 +0000 (14:20 +1200)]
MDL-32009 message: Small changes before integration

9 years agoMerge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 4 Apr 2012 02:19:32 +0000 (14:19 +1200)]
Merge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle

9 years agoMDL-32149 remove some now breaking expectError() uses.
Eloy Lafuente (stronk7) [Wed, 4 Apr 2012 01:44:10 +0000 (03:44 +0200)]
MDL-32149 remove some now breaking expectError() uses.

I've tested that unit with debug developer, debug notices and
debug none and it passes always. So, as far as I cannot find
any reason to have those expectError() there... they are out now.

9 years agoMDL-32149 Delete two more portfolio leftovers preventing simpletests to run
Eloy Lafuente (stronk7) [Wed, 4 Apr 2012 01:22:05 +0000 (03:22 +0200)]
MDL-32149 Delete two more portfolio leftovers preventing simpletests to run

(b60d21747f1ba1b52add865690fb622cdcf7b3b0 is where
all the portfolio testing stuff was deleted)

9 years agoMerge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 23:32:15 +0000 (01:32 +0200)]
Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle

9 years agoMDL-32149 adding test changes from MDL-32081
Petr Skoda [Tue, 3 Apr 2012 23:31:43 +0000 (01:31 +0200)]
MDL-32149 adding test changes from MDL-32081

9 years agoMerge branch 'MDL-32240' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 22:10:37 +0000 (00:10 +0200)]
Merge branch 'MDL-32240' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 21:59:07 +0000 (23:59 +0200)]
Merge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'wip-MDL-29678-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 21:52:10 +0000 (23:52 +0200)]
Merge branch 'wip-MDL-29678-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-32149 link wiki docs and tracker from phpunit readme file
Petr Skoda [Tue, 3 Apr 2012 21:08:25 +0000 (23:08 +0200)]
MDL-32149 link wiki docs and tracker from phpunit readme file

9 years agoMDL-32149 final readme cleanup for stage 2 of PHPUnit integration
Petr Skoda [Tue, 3 Apr 2012 20:50:45 +0000 (22:50 +0200)]
MDL-32149 final readme cleanup for stage 2 of PHPUnit integration

9 years agoMDL-32149 grade related tests
Petr Skoda [Tue, 3 Apr 2012 18:34:57 +0000 (20:34 +0200)]
MDL-32149 grade related tests

9 years agoMDL-32149 tests for conditional activities
Petr Skoda [Tue, 3 Apr 2012 18:16:00 +0000 (20:16 +0200)]
MDL-32149 tests for conditional activities

9 years agoMDL-32149 remove empty tests and outdated/disabled portfolio tests
Petr Skoda [Tue, 3 Apr 2012 18:03:59 +0000 (20:03 +0200)]
MDL-32149 remove empty tests and outdated/disabled portfolio tests

9 years agoMDL-32149 add quiz unit tests
Petr Skoda [Tue, 3 Apr 2012 17:57:24 +0000 (19:57 +0200)]
MDL-32149 add quiz unit tests

9 years agoMDL-32149 add basic file picker test and new way to set current user via int
Petr Skoda [Tue, 3 Apr 2012 17:16:31 +0000 (19:16 +0200)]
MDL-32149 add basic file picker test and new way to set current user via int

Please note that testing of individual plugins should not be done in repositorylib_test.php.

9 years agoMDL-32149 navigation tests
Petr Skoda [Tue, 3 Apr 2012 16:42:16 +0000 (18:42 +0200)]
MDL-32149 navigation tests

9 years agoMDL-32149 prevent accidental overriding of testcase constructors, use setUpBeforeClas...
Petr Skoda [Tue, 3 Apr 2012 16:18:42 +0000 (18:18 +0200)]
MDL-32149 prevent accidental overriding of testcase constructors, use setUpBeforeClass() instead

9 years agoMDL-32149 scale generator and workshop tests
Petr Skoda [Tue, 3 Apr 2012 12:50:35 +0000 (14:50 +0200)]
MDL-32149 scale generator and workshop tests

9 years agoMDL-32149 make complete PHPUnit test time 2s faster
Petr Skoda [Tue, 3 Apr 2012 10:36:36 +0000 (12:36 +0200)]
MDL-32149 make complete PHPUnit test time 2s faster

9 years agoMDL-32149 allow defining of PHPUNIT_LONGTEST from /config.php and improve acceslib...
Petr Skoda [Tue, 3 Apr 2012 09:12:52 +0000 (11:12 +0200)]
MDL-32149 allow defining of PHPUNIT_LONGTEST from /config.php and improve acceslib tests

9 years agoMDL-32149 tests for mod_wiki, mod_lti and mod_scorm
Petr Skoda [Tue, 3 Apr 2012 09:04:05 +0000 (11:04 +0200)]
MDL-32149 tests for mod_wiki, mod_lti and mod_scorm

9 years agoMDL-32149 add rating tests
Petr Skoda [Tue, 3 Apr 2012 08:51:48 +0000 (10:51 +0200)]
MDL-32149 add rating tests

9 years agoMDL-32149 add filter tests
Petr Skoda [Tue, 3 Apr 2012 08:38:03 +0000 (10:38 +0200)]
MDL-32149 add filter tests

9 years agoMDL-32149 courselib tests and support for generation of course sections
Petr Skoda [Tue, 3 Apr 2012 08:24:45 +0000 (10:24 +0200)]
MDL-32149 courselib tests and support for generation of course sections

9 years agoMDL-32149 improve testcase naming and list in config file
Petr Skoda [Tue, 3 Apr 2012 07:18:34 +0000 (09:18 +0200)]
MDL-32149 improve testcase naming and list in config file

9 years agoMDL-32149 some more cleanup and testing of PHPUnit asserts
Petr Skoda [Mon, 2 Apr 2012 22:25:25 +0000 (00:25 +0200)]
MDL-32149 some more cleanup and testing of PHPUnit asserts

9 years agoMDL-32149 setUp() and tearDown() are supposed to be 'protected', add missing blog...
Petr Skoda [Mon, 2 Apr 2012 21:55:03 +0000 (23:55 +0200)]
MDL-32149 setUp() and tearDown() are supposed to be 'protected', add missing blog testcase

9 years agoMDL-32149 add blog tests
Petr Skoda [Mon, 2 Apr 2012 21:47:45 +0000 (23:47 +0200)]
MDL-32149 add blog tests

9 years agoMDL-32149 remaining phpunit tests for backup/restore
Petr Skoda [Mon, 2 Apr 2012 21:35:13 +0000 (23:35 +0200)]
MDL-32149 remaining phpunit tests for backup/restore

9 years agoMDL-32149 significantly faster database reset, "util.php --drop" can now be interrupt...
Petr Skoda [Mon, 2 Apr 2012 20:28:06 +0000 (22:28 +0200)]
MDL-32149 significantly faster database reset, "util.php --drop" can now be interrupted at any time

9 years agoMDL-32149 add backup tests and dropping of extra tables
Petr Skoda [Mon, 2 Apr 2012 19:50:07 +0000 (21:50 +0200)]
MDL-32149 add backup tests and dropping of extra tables

9 years agoMDL-32149 reset all globals in PHPUnit tests, fix setting of $USER
Petr Skoda [Mon, 2 Apr 2012 15:56:27 +0000 (17:56 +0200)]
MDL-32149 reset all globals in PHPUnit tests, fix setting of $USER

9 years agoMDL-32149 PHPUnit test support - part 2
Petr Skoda [Sat, 31 Mar 2012 21:51:02 +0000 (23:51 +0200)]
MDL-32149 PHPUnit test support - part 2

Includes:
* constants refactoring
* reworked db table init
* support for $CFG->debug = -1
* functional DB tests
* fixed $DB->get_indexes() to not throw exceptions when table does not exist
* fix handling of user passwords in test db
* add debug info to exception messages
* removed unnecessary PHP debug errors from mathslib
* fixed @error suppression in get_string
* fixed PHPUnit error handler setup
* added timezone info to default install

9 years agoMerge branch 'MDL-32137-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 3 Apr 2012 20:22:16 +0000 (08:22 +1200)]
Merge branch 'MDL-32137-master-1' of git://git.luns.net.uk/moodle

9 years agoMDL-32251 Two more E_STRICT detected on tests execution
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 19:59:25 +0000 (21:59 +0200)]
MDL-32251 Two more E_STRICT detected on tests execution

9 years agoMerge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 19:17:58 +0000 (21:17 +0200)]
Merge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-32018-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Apr 2012 19:04:36 +0000 (21:04 +0200)]
Merge branch 'wip-MDL-32018-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'wip-MDL-30784-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 3 Apr 2012 09:00:47 +0000 (17:00 +0800)]
Merge branch 'wip-MDL-30784-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'wip-MDL-31789-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 3 Apr 2012 08:31:53 +0000 (16:31 +0800)]
Merge branch 'wip-MDL-31789-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-32081-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 3 Apr 2012 08:08:18 +0000 (16:08 +0800)]
Merge branch 'wip-MDL-32081-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-31867-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 3 Apr 2012 07:55:12 +0000 (15:55 +0800)]
Merge branch 'MDL-31867-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-17327 database : fixed comparisions in sql to be cross db compatible in data_get_...
Aparup Banerjee [Tue, 3 Apr 2012 07:06:09 +0000 (15:06 +0800)]
MDL-17327 database : fixed comparisions in sql to be cross db compatible in data_get_advanced_search_sql()

This was failing under the MSSQL database drivers.

9 years agoMerge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Tue, 3 Apr 2012 06:58:27 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle

9 years agoMDL-32251 add missing spikephpcoverage modification info, improve coding style in...
Petr Skoda [Tue, 3 Apr 2012 05:59:39 +0000 (07:59 +0200)]
MDL-32251 add missing spikephpcoverage modification info, improve coding style in competionlib

9 years agoMerge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 3 Apr 2012 03:42:58 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-mdl-30904' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Apr 2012 03:39:14 +0000 (11:39 +0800)]
Merge branch 'wip-mdl-30904' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-32270 Library: ->defaulthomepage is checked before used
Rajesh Taneja [Fri, 30 Mar 2012 04:14:41 +0000 (12:14 +0800)]
MDL-32270 Library: ->defaulthomepage is checked before used

9 years agoMerge branch 'MDL-32220' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Apr 2012 03:09:31 +0000 (11:09 +0800)]
Merge branch 'MDL-32220' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-32269-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 3 Apr 2012 02:18:19 +0000 (10:18 +0800)]
Merge branch 'wip-MDL-32269-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 2 Apr 2012 22:33:06 +0000 (10:33 +1200)]
Merge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith...
Dan Poltawski [Mon, 2 Apr 2012 08:59:10 +0000 (16:59 +0800)]
Merge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith/moodle

9 years agoMerge branch 'w14_MDL-32250_m23_simpletest110' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 2 Apr 2012 08:15:35 +0000 (16:15 +0800)]
Merge branch 'w14_MDL-32250_m23_simpletest110' of git://github.com/skodak/moodle

9 years agoMDL-32250 fixed case typo
Petr Skoda [Mon, 2 Apr 2012 07:21:14 +0000 (09:21 +0200)]
MDL-32250 fixed case typo

Thanks Dan!

9 years agoMerge branch 'MDL-32039' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Apr 2012 03:49:20 +0000 (11:49 +0800)]
Merge branch 'MDL-32039' of git://github.com/timhunt/moodle

9 years agoMDL-31768 - it is not possible to add a picture to the thanks page in feedback
Andreas Grabs [Sat, 25 Feb 2012 11:29:57 +0000 (12:29 +0100)]
MDL-31768 - it is not possible to add a picture to the thanks page in feedback

9 years agoMDL-32214 quiz regrading: with many attempts, PHP runs out of memory
M Kassaei [Tue, 27 Mar 2012 13:23:05 +0000 (14:23 +0100)]
MDL-32214 quiz regrading: with many attempts, PHP runs out of memory

9 years agoMerge branch 'MDL-32239' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Apr 2012 02:31:30 +0000 (14:31 +1200)]
Merge branch 'MDL-32239' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-32264-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 2 Apr 2012 02:17:35 +0000 (10:17 +0800)]
Merge branch 'wip-MDL-32264-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-32246' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Apr 2012 02:03:10 +0000 (10:03 +0800)]
Merge branch 'MDL-32246' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32201' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Apr 2012 01:40:09 +0000 (09:40 +0800)]
Merge branch 'MDL-32201' of git://github.com/timhunt/moodle

9 years agoMDL-30981 upgrade: Fixed a couple of phpdoc typos
Sam Hemelryk [Mon, 2 Apr 2012 00:27:23 +0000 (12:27 +1200)]
MDL-30981 upgrade: Fixed a couple of phpdoc typos

9 years agoMerge branch 'MDL-30981' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 2 Apr 2012 00:26:41 +0000 (12:26 +1200)]
Merge branch 'MDL-30981' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 1 Apr 2012 23:28:09 +0000 (11:28 +1200)]
Merge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 1 Apr 2012 23:24:54 +0000 (11:24 +1200)]
Merge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content...
Sam Hemelryk [Sun, 1 Apr 2012 23:19:58 +0000 (11:19 +1200)]
Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content' of git://github.com/kanikagoyal/moodle

9 years agoMDL-30981 Upgrade API: Added related phpdocs
Eloy Lafuente (stronk7) [Sun, 1 Apr 2012 20:48:17 +0000 (22:48 +0200)]
MDL-30981 Upgrade API: Added related phpdocs

9 years agoMerge branch 'MDL-31711' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)]
Merge branch 'MDL-31711' of git://github.com/nebgor/moodle

9 years agoMerge branch 'MDL-32289' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 1 Apr 2012 22:16:52 +0000 (10:16 +1200)]
Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle

9 years agoMDL-32251 E_STRICT fix
Petr Skoda [Sun, 1 Apr 2012 13:22:42 +0000 (15:22 +0200)]
MDL-32251 E_STRICT fix

9 years agoMDL-32251 one more E_STRICT fix
Petr Skoda [Sun, 1 Apr 2012 10:23:07 +0000 (12:23 +0200)]
MDL-32251 one more E_STRICT fix

9 years agoMDL-32289 theme_afterburner: added lang menu to frontpage layout in config.php
Mary Evans [Sun, 1 Apr 2012 00:05:14 +0000 (01:05 +0100)]
MDL-32289 theme_afterburner: added lang menu to frontpage layout in config.php

9 years agoMDL-32262 theme_afterburner: fixed missing comma in afterburner_styles.css
Mary Evans [Sat, 31 Mar 2012 23:31:23 +0000 (00:31 +0100)]
MDL-32262 theme_afterburner: fixed missing comma in afterburner_styles.css