moodle.git
9 years agoMerge branch 'MDL-34494_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:43:44 +0000 (12:43 +1200)]
Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:05:38 +0000 (12:05 +1200)]
Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:00:53 +0000 (12:00 +1200)]
Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle

9 years agoMDL-34368: Fix broken query in so tokens are correctly checked against the linked...
Nathan Mares [Tue, 17 Jul 2012 09:11:57 +0000 (19:11 +1000)]
MDL-34368: Fix broken query in so tokens are correctly checked against the linked service

9 years agoMerge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:23:27 +0000 (15:23 +0800)]
Merge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-34467-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:14:27 +0000 (15:14 +0800)]
Merge branch 'MDL-34467-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'wip-MDL-34469-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:06:59 +0000 (15:06 +0800)]
Merge branch 'wip-MDL-34469-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-34466_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:02:01 +0000 (15:02 +0800)]
Merge branch 'MDL-34466_master' of git://github.com/dmonllao/moodle

9 years agoMDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_...
Adrian Greeve [Tue, 24 Jul 2012 02:26:39 +0000 (10:26 +0800)]
MDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_by_id functions (group 15)

9 years agoMDL-34464 - mod_feedback: remove mistaken ignore_missing
Dan Poltawski [Mon, 30 Jul 2012 06:55:50 +0000 (14:55 +0800)]
MDL-34464 - mod_feedback: remove mistaken ignore_missing

9 years agoMerge branch 'MDL-34464_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jul 2012 06:48:33 +0000 (14:48 +0800)]
Merge branch 'MDL-34464_master' of git://github.com/dmonllao/moodle

9 years agoMDL-34460 - remove uncessary context retrival
Dan Poltawski [Mon, 30 Jul 2012 06:26:19 +0000 (14:26 +0800)]
MDL-34460 - remove uncessary context retrival

spotted during review

9 years agoMerge branch 'MDL-34460-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 30 Jul 2012 06:18:54 +0000 (14:18 +0800)]
Merge branch 'MDL-34460-master-integration' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34507-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 30 Jul 2012 06:04:46 +0000 (14:04 +0800)]
Merge branch 'MDL-34507-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34589' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:55:43 +0000 (13:55 +0800)]
Merge branch 'MDL-34589' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34513-WIP-MyMobile_rtl_support' of git://github.com/nadavkav/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:52:11 +0000 (13:52 +0800)]
Merge branch 'MDL-34513-WIP-MyMobile_rtl_support' of git://github.com/nadavkav/moodle

9 years agoMerge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:46:22 +0000 (13:46 +0800)]
Merge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'master_MDL-32227_add_plagiarism_api_support_to_workshop' of git://githu...
Dan Poltawski [Mon, 30 Jul 2012 05:34:20 +0000 (13:34 +0800)]
Merge branch 'master_MDL-32227_add_plagiarism_api_support_to_workshop' of git://github.com/kanikagoyal/moodle

9 years agoMerge branch 'w31_MDL-34616_m24_tinymceresize' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:14:53 +0000 (13:14 +0800)]
Merge branch 'w31_MDL-34616_m24_tinymceresize' of git://github.com/skodak/moodle

9 years agoMerge branch 'w31_MDL-34538_m24_validatefloats' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:35:05 +0000 (12:35 +0800)]
Merge branch 'w31_MDL-34538_m24_validatefloats' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-31509' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:15:39 +0000 (12:15 +0800)]
Merge branch 'MDL-31509' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34433-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:09:20 +0000 (12:09 +0800)]
Merge branch 'MDL-34433-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip-mdl-34239' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:05:14 +0000 (12:05 +0800)]
Merge branch 'wip-mdl-34239' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-34519_course_reset_patch' of git://github.com/rlorenzo/moodle
Dan Poltawski [Mon, 30 Jul 2012 03:57:26 +0000 (11:57 +0800)]
Merge branch 'MDL-34519_course_reset_patch' of git://github.com/rlorenzo/moodle

Conflicts:
course/reset.php

9 years agoMDL-34494 theme_formal_white: replaced old style core_renderer::MAIN_CONTENT_TOKEN...
kordan [Sun, 29 Jul 2012 13:27:09 +0000 (15:27 +0200)]
MDL-34494 theme_formal_white: replaced old style core_renderer::MAIN_CONTENT_TOKEN with $OUTPUT->main_content()

9 years agoMDL-34616 fix editor resizing regression
Petr Škoda [Sun, 29 Jul 2012 12:48:23 +0000 (14:48 +0200)]
MDL-34616 fix editor resizing regression

9 years agoMDL-31509 quiz outcomes: let people associate quizzes with outcomes.
Tim Hunt [Fri, 27 Jul 2012 17:06:24 +0000 (18:06 +0100)]
MDL-31509 quiz outcomes: let people associate quizzes with outcomes.

The quiz does not really support outcomes, but even so in 1.9 you could
select outcomes on the quiz edit form, and apparently this was useful to
some people, therefore we should re-enable it.

9 years agoMDL-34538 fix PARAM_FLOAT validation
Petr Škoda [Fri, 27 Jul 2012 16:44:41 +0000 (18:44 +0200)]
MDL-34538 fix PARAM_FLOAT validation

9 years agoMDL-34538 add float validation tests
Petr Škoda [Fri, 27 Jul 2012 16:42:18 +0000 (18:42 +0200)]
MDL-34538 add float validation tests

9 years agoMDL-34513 - RTL Theme fixes for Moodle 2 (theme/mymobile)
Nadav Kavalerchik [Tue, 24 Jul 2012 09:53:43 +0000 (12:53 +0300)]
MDL-34513 - RTL Theme fixes for Moodle 2 (theme/mymobile)
+ Right align frontpage course list
+ right align activity and resource titles
+ Two Columns on/off slider fix
+ Right align content in Blocks
+ Fix checkbox question types in quiz
+ Right align titles of fields in Forms
+ minor ui tweaks

9 years agoMDL-34467 glossary: Changing strictness of new context_xxx::instances() calls
Ankit Agarwal [Fri, 27 Jul 2012 06:27:09 +0000 (14:27 +0800)]
MDL-34467 glossary: Changing strictness of new context_xxx::instances() calls

9 years agoMDL-34239 Blog: Editing blog associated with module will be keep it's association
Rajesh Taneja [Tue, 24 Jul 2012 02:18:15 +0000 (10:18 +0800)]
MDL-34239 Blog: Editing blog associated with module will be keep it's association

9 years agoMDL-34467 page: Repalce all instances of get_context_instanc() with respective contex...
Ankit Agarwal [Fri, 27 Jul 2012 05:27:36 +0000 (13:27 +0800)]
MDL-34467 page: Repalce all instances of get_context_instanc() with respective context_XXX::instance()

9 years agoMDL-34467 lti: Repalce all instances of get_context_instanc() with respective context...
Ankit Agarwal [Fri, 27 Jul 2012 05:27:13 +0000 (13:27 +0800)]
MDL-34467 lti: Repalce all instances of get_context_instanc() with respective context_XXX::instance()

9 years agoMDL-34467 lesson: Repalce all instances of get_context_instanc() with respective...
Ankit Agarwal [Fri, 27 Jul 2012 05:26:35 +0000 (13:26 +0800)]
MDL-34467 lesson: Repalce all instances of get_context_instanc() with respective context_XXX::instance()

9 years agoMDL-34466 mod_choice Replace all instances of get_context_instance() with respective...
David Monllao [Thu, 26 Jul 2012 06:57:34 +0000 (14:57 +0800)]
MDL-34466 mod_choice Replace all instances of get_context_instance() with respective context_XXXX class in mod/choice

9 years agoMDL-34466 mod_folder Replace all instances of get_context_instance() with respective...
David Monllao [Thu, 26 Jul 2012 06:53:42 +0000 (14:53 +0800)]
MDL-34466 mod_folder Replace all instances of get_context_instance() with respective context_XXXX class in mod/folder

9 years agoMDL-34466 mod_chat Replace all instances of get_context_instance() with respective...
David Monllao [Thu, 26 Jul 2012 06:50:54 +0000 (14:50 +0800)]
MDL-34466 mod_chat Replace all instances of get_context_instance() with respective context_XXXX class in mod/chat

9 years agoMDL-34467 imscp: Repalce all instances of get_context_instanc() with respective conte...
Ankit Agarwal [Fri, 27 Jul 2012 05:25:55 +0000 (13:25 +0800)]
MDL-34467 imscp: Repalce all instances of get_context_instanc() with respective context_XXX::instance()

9 years agoMDL-34467 glossary: Repalce all instances of get_context_instanc() with respective...
Ankit Agarwal [Fri, 27 Jul 2012 05:25:24 +0000 (13:25 +0800)]
MDL-34467 glossary: Repalce all instances of get_context_instanc() with respective context_XXX::instance()

9 years agoMDL-34466 mod_assignment Replace all instances of get_context_instance() with respect...
David Monllao [Thu, 26 Jul 2012 06:24:58 +0000 (14:24 +0800)]
MDL-34466 mod_assignment Replace all instances of get_context_instance() with respective context_XXXX class in mod/assignment

9 years agoMDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8)
Adrian Greeve [Wed, 25 Jul 2012 08:25:55 +0000 (16:25 +0800)]
MDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8)

9 years agoMDL-34507 Repository: Better support for 'any' accepted filetypes
Frederic Massart [Wed, 25 Jul 2012 07:29:47 +0000 (15:29 +0800)]
MDL-34507 Repository: Better support for 'any' accepted filetypes

9 years agoMDL-34464 mod_feedback Replace all instances of get_context_instance() with respectiv...
David Monllao [Thu, 26 Jul 2012 05:59:09 +0000 (13:59 +0800)]
MDL-34464 mod_feedback Replace all instances of get_context_instance() with respective context_XXXX class in mod/feedback

9 years agoMDL-34464 mod_data Replace all instances of get_context_instance() with respective...
David Monllao [Thu, 26 Jul 2012 05:57:56 +0000 (13:57 +0800)]
MDL-34464 mod_data Replace all instances of get_context_instance() with respective context_XXXX class in mod/data

9 years agoMDL-34589 quiz report graphs: PHP5.4 issue with unset($array[$float]).
Tim Hunt [Thu, 26 Jul 2012 17:47:57 +0000 (18:47 +0100)]
MDL-34589 quiz report graphs: PHP5.4 issue with unset($array[$float]).

Thanks to Matthew Davidson for diagnosing the problem.

9 years agoweekly release 2.4dev
Aparup Banerjee [Thu, 26 Jul 2012 06:23:09 +0000 (14:23 +0800)]
weekly release 2.4dev

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Aparup Banerjee [Thu, 26 Jul 2012 06:11:57 +0000 (14:11 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMDL-34460 Librairies: Replaced deprecated get_context_instance()
Frederic Massart [Thu, 26 Jul 2012 03:38:02 +0000 (11:38 +0800)]
MDL-34460 Librairies: Replaced deprecated get_context_instance()

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 26 Jul 2012 00:31:43 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-29007 Rename moodle-enrol-notification to moodle-core-notification
Andrew Robert Nicols [Sat, 7 Jul 2012 10:31:55 +0000 (11:31 +0100)]
MDL-29007 Rename moodle-enrol-notification to moodle-core-notification

9 years agoMDl-31294 Forms Library: updated php docs pointing to addHelpButton
Rajesh Taneja [Wed, 25 Jul 2012 06:10:52 +0000 (14:10 +0800)]
MDl-31294 Forms Library: updated php docs pointing to addHelpButton

9 years agoMerge branch 'MDL-13629_droplow' of git://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 25 Jul 2012 04:29:05 +0000 (12:29 +0800)]
Merge branch 'MDL-13629_droplow' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-mdl-19430' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Wed, 25 Jul 2012 04:25:04 +0000 (16:25 +1200)]
Merge branch 'wip-mdl-19430' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-34441 dbtransfer - do not attempt migration if moodle is not installed.
Dan Poltawski [Wed, 25 Jul 2012 03:26:55 +0000 (11:26 +0800)]
MDL-34441 dbtransfer - do not attempt migration if moodle is not installed.

9 years agoMDL-34441 tool_dbtranfer - fix codechecker warnings
Dan Poltawski [Wed, 25 Jul 2012 02:43:37 +0000 (10:43 +0800)]
MDL-34441 tool_dbtranfer - fix codechecker warnings

Since we were so close to perfection.

9 years agoMDL-19430 My Moodle: Fixed spacer icon to align move icons
Rajesh Taneja [Wed, 25 Jul 2012 02:28:32 +0000 (10:28 +0800)]
MDL-19430 My Moodle: Fixed spacer icon to align move icons

9 years agoMerge branch 'w30_MDL-34441_m24_dbtransfer' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 25 Jul 2012 02:26:01 +0000 (10:26 +0800)]
Merge branch 'w30_MDL-34441_m24_dbtransfer' of git://github.com/skodak/moodle

9 years agoMDL-13629 grade: added some unit tests to clarify the handling of droplow and improve...
Andrew Davis [Thu, 5 Jul 2012 03:52:30 +0000 (11:52 +0800)]
MDL-13629 grade: added some unit tests to clarify the handling of droplow and improved apply_limit_rules()

9 years agoMerge branch 'w30_MDL-34475_m24_saveondefault' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Jul 2012 23:13:28 +0000 (11:13 +1200)]
Merge branch 'w30_MDL-34475_m24_saveondefault' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 24 Jul 2012 21:20:44 +0000 (09:20 +1200)]
Merge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle

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

9 years agoMDL-34519 - Course reset not protected by proper capability
Rex Lorenzo [Tue, 24 Jul 2012 19:01:11 +0000 (12:01 -0700)]
MDL-34519 - Course reset not protected by proper capability

9 years agoMDL-34433 Check for existence of e and e.target in set_form_changed
Andrew Robert Nicols [Mon, 23 Jul 2012 14:28:26 +0000 (15:28 +0100)]
MDL-34433 Check for existence of e and e.target in set_form_changed

This is required for cases when code directly calls set_form_changed as
happens with the filepicker.

9 years agoMerge branch 'MDL-34468-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 24 Jul 2012 09:53:50 +0000 (17:53 +0800)]
Merge branch 'MDL-34468-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-34458-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 24 Jul 2012 09:24:15 +0000 (17:24 +0800)]
Merge branch 'MDL-34458-master-integration' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34461-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 24 Jul 2012 09:08:13 +0000 (17:08 +0800)]
Merge branch 'MDL-34461-master-integration' of git://github.com/FMCorz/moodle

9 years agoMDL-34468 scorm: Replace all instances of get_context_instance() with respective...
Ankit Agarwal [Tue, 24 Jul 2012 08:56:57 +0000 (16:56 +0800)]
MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm

9 years agoMDL-34468 quiz: Replace all instances of get_context_instance() with respective conte...
Ankit Agarwal [Tue, 24 Jul 2012 08:55:49 +0000 (16:55 +0800)]
MDL-34468 quiz: Replace all instances of get_context_instance() with respective context_XXXX class in mod/quiz

9 years agoMDL-34468 survey: Replace all instances of get_context_instance() with respective...
Ankit Agarwal [Tue, 24 Jul 2012 08:54:52 +0000 (16:54 +0800)]
MDL-34468 survey: Replace all instances of get_context_instance() with respective context_XXXX class in mod/survey

9 years agoMDL-34458 Librairies: Replaced deprecated get_context_instance()
Frederic Massart [Tue, 24 Jul 2012 08:57:51 +0000 (16:57 +0800)]
MDL-34458 Librairies: Replaced deprecated get_context_instance()

9 years agoMerge branch 'wip-mdl-31294' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 24 Jul 2012 08:57:58 +0000 (16:57 +0800)]
Merge branch 'wip-mdl-31294' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-34456-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 24 Jul 2012 08:53:45 +0000 (16:53 +0800)]
Merge branch 'MDL-34456-master-integration' of git://github.com/FMCorz/moodle

9 years agoMDL-26969 assignment : clarified phpdoc and fixed whitespace.
Aparup Banerjee [Tue, 24 Jul 2012 08:35:41 +0000 (16:35 +0800)]
MDL-26969 assignment : clarified phpdoc and fixed whitespace.

9 years agoMerge branch 'MDL-26969' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 24 Jul 2012 08:39:59 +0000 (16:39 +0800)]
Merge branch 'MDL-26969' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-34459-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 24 Jul 2012 08:35:01 +0000 (16:35 +0800)]
Merge branch 'MDL-34459-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-34459 course: Changing strictness of context call in get_category_or_system_conte...
Ankit Agarwal [Tue, 24 Jul 2012 03:52:38 +0000 (11:52 +0800)]
MDL-34459 course: Changing strictness of context call in get_category_or_system_context() to keep it consistent with past usages

9 years agoMDL-34459 course: changing strictness of context calls as needed
Ankit Agarwal [Tue, 24 Jul 2012 03:49:44 +0000 (11:49 +0800)]
MDL-34459 course: changing strictness of context calls as needed

9 years agoMDL-34470 course: Replace all instances of get_context_instance() with context_xxx...
Ankit Agarwal [Mon, 23 Jul 2012 07:59:04 +0000 (15:59 +0800)]
MDL-34470 course: Replace all instances of get_context_instance() with context_xxx::instance() in course/

9 years agoMerge branch 'wip-MDL-34463-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 24 Jul 2012 08:16:45 +0000 (16:16 +0800)]
Merge branch 'wip-MDL-34463-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-34455-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 24 Jul 2012 08:01:00 +0000 (16:01 +0800)]
Merge branch 'MDL-34455-master-integration' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34484' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 24 Jul 2012 07:40:18 +0000 (15:40 +0800)]
Merge branch 'MDL-34484' of git://github.com/timhunt/moodle

9 years agoMDL-34462 cohort: remove uncessary MUST_EXIST params
Dan Poltawski [Tue, 24 Jul 2012 07:23:07 +0000 (15:23 +0800)]
MDL-34462 cohort: remove uncessary MUST_EXIST params

(its now the default)

9 years agoMerge branch 'MDL-34462-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 24 Jul 2012 07:16:39 +0000 (15:16 +0800)]
Merge branch 'MDL-34462-master-integration' of git://github.com/FMCorz/moodle

9 years agoMDL-31294 Forms Library: Removed deprecated functions from forms library
Rajesh Taneja [Fri, 20 Jul 2012 02:28:59 +0000 (10:28 +0800)]
MDL-31294 Forms Library: Removed deprecated functions from forms library

9 years agoMerge branch 'wip-MDL-34457-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 24 Jul 2012 07:04:53 +0000 (15:04 +0800)]
Merge branch 'wip-MDL-34457-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-34470-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 24 Jul 2012 06:51:14 +0000 (14:51 +0800)]
Merge branch 'MDL-34470-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Jul 2012 06:07:26 +0000 (14:07 +0800)]
Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle

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

9 years agoMDL-34463 - lib - Alteration of the get_context_instance function to utilize the...
Adrian Greeve [Tue, 24 Jul 2012 06:04:40 +0000 (14:04 +0800)]
MDL-34463 - lib - Alteration of the get_context_instance function to utilize the new function context_XXXX::instance().

9 years agoMerge branch 'w30_MDL-34129_m24_enrolinfo' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Jul 2012 05:41:35 +0000 (13:41 +0800)]
Merge branch 'w30_MDL-34129_m24_enrolinfo' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-mdl-32940' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 24 Jul 2012 05:39:59 +0000 (13:39 +0800)]
Merge branch 'wip-mdl-32940' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 24 Jul 2012 04:14:17 +0000 (12:14 +0800)]
Merge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-33061 - lib - Replacement of get_context_instance with the new function call...
Adrian Greeve [Tue, 24 Jul 2012 01:52:41 +0000 (09:52 +0800)]
MDL-33061 - lib - Replacement of get_context_instance with the new function call (group 3)

9 years agoMDL-34456 Librairies: Replaced deprecated get_context_instance()
Frederic Massart [Mon, 23 Jul 2012 07:55:09 +0000 (15:55 +0800)]
MDL-34456 Librairies: Replaced deprecated get_context_instance()

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 24 Jul 2012 00:31:47 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-34352-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 23 Jul 2012 23:21:16 +0000 (11:21 +1200)]
Merge branch 'MDL-34352-master-2' of git://git.luns.net.uk/moodle

9 years agoMDL-32227: Plagiarism API - add support for plagiarism api to workshop module
Kanika Goyal [Mon, 23 Jul 2012 20:22:54 +0000 (01:52 +0530)]
MDL-32227: Plagiarism API - add support for plagiarism api to workshop module

9 years agoMDL-34475 add default value to xmldb_field hash calculation
Petr Škoda [Mon, 23 Jul 2012 18:48:14 +0000 (20:48 +0200)]
MDL-34475 add default value to xmldb_field hash calculation

9 years agoMDL-34352 Convert chooserdialogue IDs to classes
Andrew Robert Nicols [Mon, 16 Jul 2012 09:28:27 +0000 (10:28 +0100)]
MDL-34352 Convert chooserdialogue IDs to classes

9 years agoMDL-34484 unit tests: stop phpunit using testcase names as class names
Tim Hunt [Mon, 23 Jul 2012 10:08:37 +0000 (11:08 +0100)]
MDL-34484 unit tests: stop phpunit using testcase names as class names

9 years agoMDL-34461 Librairies: Replaced deprecated get_context_instance()
Frederic Massart [Mon, 23 Jul 2012 08:08:41 +0000 (16:08 +0800)]
MDL-34461 Librairies: Replaced deprecated get_context_instance()