moodle.git
10 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

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

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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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!

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 years agoMDL-32251 use standard PHP debug levels instead of original 38911
Petr Skoda [Fri, 30 Mar 2012 17:19:06 +0000 (19:19 +0200)]
MDL-32251 use standard PHP debug levels instead of original 38911

10 years agoMDL-32251 more E_STRICT fixes
Petr Skoda [Fri, 30 Mar 2012 17:02:58 +0000 (19:02 +0200)]
MDL-32251 more E_STRICT fixes

10 years agoMDL-17327 - data - improved the sql query for very large advanced searches
adrian@moodle.com [Tue, 13 Dec 2011 02:45:48 +0000 (10:45 +0800)]
MDL-17327 - data - improved the sql query for very large advanced searches

10 years agoMDL-32150 Libraries: checkbox controller will not check or uncheck freezed checkboxes
Rajesh Taneja [Thu, 22 Mar 2012 02:28:39 +0000 (10:28 +0800)]
MDL-32150 Libraries: checkbox controller will not check or uncheck freezed checkboxes

10 years agoMDL-32150 Libraries: checkall and uncheckall will not select disabled or readonly...
Rajesh Taneja [Thu, 22 Mar 2012 02:09:39 +0000 (10:09 +0800)]
MDL-32150 Libraries: checkall and uncheckall will not select disabled or readonly checkboxes

10 years agoMDL-30904 Calendar: Event links are descriptive with hidden event name, for screen...
Rajesh Taneja [Fri, 23 Mar 2012 05:39:51 +0000 (13:39 +0800)]
MDL-30904 Calendar: Event links are descriptive with hidden event name, for screen readers

10 years agoMDL-31867 tags: Improve performance of course_get_tagged_courses()
Sam Hemelryk [Tue, 27 Mar 2012 05:43:43 +0000 (13:43 +0800)]
MDL-31867 tags: Improve performance of course_get_tagged_courses()

10 years agoMDL-32269: undoing changes from MDL-32095 causing fatal error when using wikimedia
Marina Glancy [Fri, 30 Mar 2012 01:11:20 +0000 (09:11 +0800)]
MDL-32269: undoing changes from MDL-32095 causing fatal error when using wikimedia

10 years agoMDL-32171: add 'Manage' link to Picasa repository
Marina Glancy [Fri, 23 Mar 2012 06:11:00 +0000 (14:11 +0800)]
MDL-32171: add 'Manage' link to Picasa repository

10 years agoMDL-31789: Allowing context object to be passed to JS using json_encode()
Marina Glancy [Wed, 28 Mar 2012 03:38:53 +0000 (11:38 +0800)]
MDL-31789: Allowing context object to be passed to JS using json_encode()

Classes with magic properties such as context do not pass through json_encode().
The solution is to implement iterator in such classes and convert what we
feed to json_encode to array using 'foreach' before we pass it to json_encode():
- class context implements IteratorAggregate
- added function convert_to_array() that converts anything to array
- before calling json_encode we convert the argument to array

10 years agoMDL-30784 - lib - Patch provided by Jason Hardin to provide detection for Android...
Jason Fowler [Mon, 26 Mar 2012 03:29:58 +0000 (11:29 +0800)]
MDL-30784 - lib - Patch provided by Jason Hardin to provide detection for Android Tablets to allow the theme engine to provide the tablet theme

10 years agoMDL-32018 mod_wiki: Fixed up whitespace after peer-review
Sam Hemelryk [Wed, 28 Mar 2012 21:12:50 +0000 (10:12 +1300)]
MDL-32018 mod_wiki: Fixed up whitespace after peer-review

10 years agoMDL-32018 mod_wiki: Fixed formatting of the page title so that is is consistent and...
Sam Hemelryk [Wed, 28 Mar 2012 00:20:15 +0000 (13:20 +1300)]
MDL-32018 mod_wiki: Fixed formatting of the page title so that is is consistent and secure

10 years agoMDL-32018 mod_wiki: Improved form definitions to ensure they consistent and secure
Sam Hemelryk [Tue, 27 Mar 2012 23:24:52 +0000 (12:24 +1300)]
MDL-32018 mod_wiki: Improved form definitions to ensure they consistent and secure

10 years agoMDL-32081 csslib: Improved handling of parentheses when processing styles
Sam Hemelryk [Mon, 26 Mar 2012 23:34:31 +0000 (12:34 +1300)]
MDL-32081 csslib: Improved handling of parentheses when processing styles

10 years agoMDL-32081 csslib: Added unit tests for complex background images
Sam Hemelryk [Mon, 26 Mar 2012 23:20:28 +0000 (12:20 +1300)]
MDL-32081 csslib: Added unit tests for complex background images

10 years agoMDL-32264 theme_standard: Fixed multi-day calendar event border issue
Sam Hemelryk [Thu, 29 Mar 2012 20:34:27 +0000 (09:34 +1300)]
MDL-32264 theme_standard: Fixed multi-day calendar event border issue

10 years agoMDL-32039 qeupgradehelper: fix typos in the lang strings
Tim Hunt [Thu, 29 Mar 2012 20:20:04 +0000 (21:20 +0100)]
MDL-32039 qeupgradehelper: fix typos in the lang strings

10 years agoMDL-32251 more E_STRCT fixes
Petr Skoda [Thu, 29 Mar 2012 14:29:29 +0000 (16:29 +0200)]
MDL-32251 more E_STRCT fixes

10 years agoMDL-32258 database module does not have any data_cron() function to execute
David Mudrak [Thu, 29 Mar 2012 13:59:45 +0000 (15:59 +0200)]
MDL-32258 database module does not have any data_cron() function to execute

10 years agoMDL-32256 quiz_cron() now returns true as expected by the current API
David Mudrak [Thu, 29 Mar 2012 13:45:45 +0000 (15:45 +0200)]
MDL-32256 quiz_cron() now returns true as expected by the current API

10 years agoMDL-32251 E_STRICT fixes part 3
Petr Skoda [Thu, 29 Mar 2012 12:03:20 +0000 (14:03 +0200)]
MDL-32251 E_STRICT fixes part 3

10 years agoMDL-32246 question export: should cope with unrecognised qtypes.
Tim Hunt [Wed, 28 Mar 2012 15:52:57 +0000 (16:52 +0100)]
MDL-32246 question export: should cope with unrecognised qtypes.

If a question is of an unrecognised type, then we just omit it from the export.

10 years agoMDL-32239 question bank: wrong cap checks editing/viewing quesitions
Tim Hunt [Wed, 28 Mar 2012 11:09:12 +0000 (12:09 +0100)]
MDL-32239 question bank: wrong cap checks editing/viewing quesitions

None of these problems affect the default roles. They only occur when
the permissions have been edited to allow restricted subsets of the
question capabilities.

In some cases, things that the restriced subset of capabilities should
have allowed were blocked by errors. In other cases, users were allowed
to do more than they should bave been due to failures to check the
right capabilities in the right places.

For full details, see the bug report.

Two of the bugs were previously reported separately as MDL-26395 and
MDL-27232.

10 years agoMDL-32220 question import: files sometimes stored in the wrong context.
Tim Hunt [Tue, 27 Mar 2012 16:41:14 +0000 (17:41 +0100)]
MDL-32220 question import: files sometimes stored in the wrong context.

Sadly, this involves a small API change, but I don't believe anyone was
using the argument I had to remove (because we were sometimes passing a
wrong value, and there is not way to compute the right value at that
point in the code.)

Also sadly, the code to compute the context we are importing into is now
rather spaghetti-like, but it works.

10 years agoMDL-32201 question export: use qformat_xml::write_answer in base class
Tim Hunt [Mon, 26 Mar 2012 16:43:18 +0000 (17:43 +0100)]
MDL-32201 question export: use qformat_xml::write_answer in base class

Without this, images in answers were not being written to the export
file for questions using extra_answer_fields.

10 years agoMDL-32250 import latest SimpleTest 1.1.0
Petr Skoda [Thu, 29 Mar 2012 09:29:13 +0000 (11:29 +0200)]
MDL-32250 import latest SimpleTest 1.1.0

10 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:25:53 +0000 (13:25 +0200)]
weekly release 2.3dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:19:59 +0000 (13:19 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoRevert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"
Dan Poltawski [Thu, 29 Mar 2012 08:05:47 +0000 (16:05 +0800)]
Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"

This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.

Conflicts:

lib/db/upgrade.php
version.php

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 29 Mar 2012 00:31:42 +0000 (00:31 +0000)]
Automatically generated installer lang files

10 years agoMerge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 28 Mar 2012 20:49:38 +0000 (22:49 +0200)]
Merge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle

10 years agoMDL-32095 last E_STRICT fix for now
Petr Skoda [Wed, 28 Mar 2012 20:48:18 +0000 (22:48 +0200)]
MDL-32095 last E_STRICT fix for now

10 years agoMDL-32095 fix outputlib test to setup debug level properly
Petr Skoda [Wed, 28 Mar 2012 20:47:57 +0000 (22:47 +0200)]
MDL-32095 fix outputlib test to setup debug level properly

10 years agoMDL-12730 new debug levels (support strict) + upgrade from old ones
Petr Skoda [Wed, 28 Mar 2012 14:39:42 +0000 (16:39 +0200)]
MDL-12730 new debug levels (support strict) + upgrade from old ones

10 years agoMDL-32213 Question upgrade now correctly handles non-core manually-graded question...
Davo Smith [Tue, 27 Mar 2012 12:44:07 +0000 (13:44 +0100)]
MDL-32213 Question upgrade now correctly handles non-core manually-graded question types

10 years agoMDL-31775 lesson: fix undefined variable warnings
Dan Poltawski [Tue, 27 Mar 2012 12:01:06 +0000 (20:01 +0800)]
MDL-31775 lesson: fix undefined variable warnings

10 years agoMerge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2012 08:10:17 +0000 (10:10 +0200)]
Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle

Conflicts:
lib/db/upgrade.php
version.php

10 years agoMDL-31711 Documentation : changed usages of @property to @var for non-magic variables.
Aparup Banerjee [Tue, 27 Mar 2012 08:01:14 +0000 (16:01 +0800)]
MDL-31711 Documentation : changed usages of @property to @var for non-magic variables.

10 years agoMerge branch 'MDL-32028' of git://github.com/nebgor/moodle
Dan Poltawski [Tue, 27 Mar 2012 06:46:52 +0000 (14:46 +0800)]
Merge branch 'MDL-32028' of git://github.com/nebgor/moodle

10 years agoMerge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 27 Mar 2012 05:22:01 +0000 (13:22 +0800)]
Merge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-30235' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 27 Mar 2012 04:37:08 +0000 (12:37 +0800)]
Merge branch 'MDL-30235' of git://github.com/lazydaisy/moodle

10 years agoMerge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 27 Mar 2012 02:15:18 +0000 (10:15 +0800)]
Merge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 27 Mar 2012 02:10:05 +0000 (10:10 +0800)]
Merge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 27 Mar 2012 01:58:44 +0000 (09:58 +0800)]
Merge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 26 Mar 2012 22:03:19 +0000 (11:03 +1300)]
Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 26 Mar 2012 21:05:43 +0000 (10:05 +1300)]
Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 26 Mar 2012 20:51:40 +0000 (09:51 +1300)]
Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-32202' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 19:36:08 +0000 (21:36 +0200)]
Merge branch 'MDL-32202' of git://github.com/stronk7/moodle