moodle.git
10 years agoMerge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7...
Petr Skoda [Mon, 14 Feb 2011 19:57:13 +0000 (20:57 +0100)]
Merge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-25553_lesson_jumpto_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:39:31 +0000 (20:39 +0100)]
Merge branch 'MDL-25553_lesson_jumpto_wip' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-25612_rss_block' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:37:28 +0000 (20:37 +0100)]
Merge branch 'MDL-25612_rss_block' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-26399_oracle_restore_wip' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 14 Feb 2011 19:34:58 +0000 (20:34 +0100)]
Merge branch 'MDL-26399_oracle_restore_wip' of git://github.com/stronk7/moodle

10 years agoMerge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 19:15:37 +0000 (20:15 +0100)]
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26338' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 18:57:38 +0000 (19:57 +0100)]
Merge branch 'MDL-26338' of git://github.com/timhunt/moodle

10 years agoMDL-26399 restore - fix oracle/mssql problems
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 18:42:57 +0000 (19:42 +0100)]
MDL-26399 restore - fix oracle/mssql problems

10 years agoMDL-25626 fix previous incorrect fix incorrect cm id in completion report
Petr Skoda [Mon, 14 Feb 2011 18:41:05 +0000 (19:41 +0100)]
MDL-25626 fix previous incorrect fix incorrect cm id in completion report

10 years agoMerge branch 'MDL-26356' of git://github.com/ppichet/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:29:46 +0000 (18:29 +0100)]
Merge branch 'MDL-26356' of git://github.com/ppichet/moodle

10 years agoMerge branch 'MDL-26332' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)]
Merge branch 'MDL-26332' of git://github.com/timhunt/moodle

10 years agoMerge branch 'mdl-26299' of git://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)]
Merge branch 'mdl-26299' of git://github.com/mackensen/moodle

10 years agoPartially merge w07_MDL-25575_20_contexttrouble. See PULL-299
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:54:42 +0000 (17:54 +0100)]
Partially merge w07_MDL-25575_20_contexttrouble. See PULL-299

10 years agoMerge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:38:22 +0000 (17:38 +0100)]
Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 16:10:29 +0000 (17:10 +0100)]
Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 14:58:26 +0000 (15:58 +0100)]
Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle

10 years agoMDL-26389 improve profile and search engine privacy
Petr Skoda [Mon, 14 Feb 2011 14:42:26 +0000 (15:42 +0100)]
MDL-26389 improve profile and search engine privacy

10 years agoMerge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 14:06:28 +0000 (15:06 +0100)]
Merge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 13:38:02 +0000 (14:38 +0100)]
Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-25974_20_switchhidden' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 13:23:05 +0000 (14:23 +0100)]
Merge branch 'w07_MDL-25974_20_switchhidden' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)]
Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26314_20_initcall' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:35:18 +0000 (12:35 +0100)]
Merge branch 'w07_MDL-26314_20_initcall' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 11:31:50 +0000 (12:31 +0100)]
Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle

10 years agoMerge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 14 Feb 2011 08:52:28 +0000 (09:52 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

10 years agoMDL-25215 fix file.JPG.jpg extension problems
Petr Skoda [Mon, 14 Feb 2011 08:50:07 +0000 (09:50 +0100)]
MDL-25215 fix file.JPG.jpg extension problems

10 years agoMerge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 14 Feb 2011 08:43:06 +0000 (09:43 +0100)]
Merge branch 'm20_MDL-25215_filepicker_saveas' of git://github.com/dongsheng/moodle

10 years agoAutomatic installer lang files (20110214)
AMOS bot [Mon, 14 Feb 2011 08:36:04 +0000 (09:36 +0100)]
Automatic installer lang files (20110214)

10 years agoMerge branch 'MDL-26353-database-import-help' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 14 Feb 2011 08:20:53 +0000 (09:20 +0100)]
Merge branch 'MDL-26353-database-import-help' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-25991_actionnav' of github.com:skodak/moodle
Petr Skoda [Mon, 14 Feb 2011 07:57:58 +0000 (08:57 +0100)]
Merge branch 'MDL-25991_actionnav' of github.com:skodak/moodle

10 years agoMerge branch 'w07_MDL-26153_20_yuicombo' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:10:11 +0000 (02:10 +0100)]
Merge branch 'w07_MDL-26153_20_yuicombo' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26294_20_byteserving' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:08:06 +0000 (02:08 +0100)]
Merge branch 'w07_MDL-26294_20_byteserving' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26307_20_dbport' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 01:00:19 +0000 (02:00 +0100)]
Merge branch 'w07_MDL-26307_20_dbport' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:53:45 +0000 (01:53 +0100)]
Merge branch 'w07_MDL-25626_20_completionerror' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26355_20_installsize' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:50:55 +0000 (01:50 +0100)]
Merge branch 'w07_MDL-26355_20_installsize' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26274_rating_delete' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:48:03 +0000 (01:48 +0100)]
Merge branch 'MDL-26274_rating_delete' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:44:08 +0000 (01:44 +0100)]
Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26380_20_mediafilterperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:41:19 +0000 (01:41 +0100)]
Merge branch 'w07_MDL-26380_20_mediafilterperf' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:25:44 +0000 (01:25 +0100)]
Merge branch 'w07_MDL-26351_20_instquotes' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Feb 2011 00:09:07 +0000 (01:09 +0100)]
Merge branch 'w07_MDL-26030_20_mediafilter' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26379_20_minify' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:56:02 +0000 (00:56 +0100)]
Merge branch 'w07_MDL-26379_20_minify' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:52:09 +0000 (00:52 +0100)]
Merge branch 'w07_MDL-26352_20_metacourse' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26271_20_forumsearch' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:38:21 +0000 (00:38 +0100)]
Merge branch 'w07_MDL-26271_20_forumsearch' of git://github.com/skodak/moodle

10 years agoMerge branch 'w07_MDL-26322_20_wantsurl' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 23:19:08 +0000 (00:19 +0100)]
Merge branch 'w07_MDL-26322_20_wantsurl' of git://github.com/skodak/moodle

10 years agoMDL-24898 external blogs - strip html and truncate subject
Eloy Lafuente (stronk7) [Sun, 13 Feb 2011 22:03:55 +0000 (23:03 +0100)]
MDL-24898 external blogs - strip html and truncate subject

10 years agoMDL-25575 fix broken block support in get_courseid_from_context()
Petr Skoda [Sun, 13 Feb 2011 17:59:53 +0000 (18:59 +0100)]
MDL-25575 fix broken block support in get_courseid_from_context()

10 years agoMDL-26223 prevent getting content of hidden blocks in edit mode
Petr Skoda [Sun, 13 Feb 2011 17:14:55 +0000 (18:14 +0100)]
MDL-26223 prevent getting content of hidden blocks in edit mode

10 years agoMDL-26314 fix phpdocs typo
Petr Skoda [Sun, 13 Feb 2011 16:44:01 +0000 (17:44 +0100)]
MDL-26314 fix phpdocs typo

10 years agoMDL-25974 fix access to activities when role switched in hidden course and some codin...
Petr Skoda [Sun, 13 Feb 2011 15:17:47 +0000 (16:17 +0100)]
MDL-25974 fix access to activities when role switched in hidden course and some coding style strict comparison fixes

The problem with strict comparison of numerical values fails badly if one is int and the other is string, moodle core apis do not guarantee return types much.

10 years agoMDL-25998 fix default manual enrol role
Petr Skoda [Sun, 13 Feb 2011 12:58:18 +0000 (13:58 +0100)]
MDL-25998 fix default manual enrol role

10 years agoMDL-26131 fix several collapsible_region issues
Petr Skoda [Sun, 13 Feb 2011 10:52:09 +0000 (11:52 +0100)]
MDL-26131 fix several collapsible_region issues

1/ the $default was not passed from print_collapsible_region()
2/ incorrect php docs describing $userpref
3/ missing empty() check on $userpref

10 years agoMDL-26142 fix immediately spelling in strings, comments and code
Petr Skoda [Sun, 13 Feb 2011 10:36:46 +0000 (11:36 +0100)]
MDL-26142 fix immediately spelling in strings, comments and code

10 years agoMDL-26355 increase size of installer forms fields
Petr Skoda [Sun, 13 Feb 2011 09:52:28 +0000 (10:52 +0100)]
MDL-26355 increase size of installer forms fields

10 years agoMDL-26383 add missing bloglevelupgrade admin section
Petr Skoda [Sun, 13 Feb 2011 09:22:19 +0000 (10:22 +0100)]
MDL-26383 add missing bloglevelupgrade admin section

10 years agoMDL-23939 do not load groups and profile for guest user because they can not have...
Petr Skoda [Sat, 12 Feb 2011 22:22:22 +0000 (23:22 +0100)]
MDL-23939 do not load groups and profile for guest user because they can not have both

10 years agoMDL-23939 minor course_display coding style improvements and inline docs
Petr Skoda [Sat, 12 Feb 2011 22:06:11 +0000 (23:06 +0100)]
MDL-23939 minor course_display coding style improvements and inline docs

10 years agoMDL-23939 lazy load course_display with new course_get_display()
Aparup Banerjee [Sat, 12 Feb 2011 21:45:17 +0000 (22:45 +0100)]
MDL-23939 lazy load course_display with new course_get_display()

This change speeds up user login and makes the session smaller.

10 years agoMDL-26153 fix yui combo loading for images with numbers in file name
Petr Skoda [Sat, 12 Feb 2011 20:56:03 +0000 (21:56 +0100)]
MDL-26153 fix yui combo loading for images with numbers in file name

10 years agoMDL-26294 fix byteserving regression
Petr Skoda [Sat, 12 Feb 2011 19:39:53 +0000 (20:39 +0100)]
MDL-26294 fix byteserving regression

Credit goes to James Mitchell.

10 years agoMDL-25612 sql - make rss_client block cross-db
Eloy Lafuente (stronk7) [Sat, 12 Feb 2011 19:38:03 +0000 (20:38 +0100)]
MDL-25612 sql - make rss_client block cross-db

10 years agoMDL-26307 fix dbport and dbsocket support when creating mysql database
Petr Skoda [Sat, 12 Feb 2011 19:08:49 +0000 (20:08 +0100)]
MDL-26307 fix dbport and dbsocket support when creating mysql database

10 years agoMDL-26030 more mediaplugin fixes
Petr Skoda [Sat, 12 Feb 2011 12:52:27 +0000 (13:52 +0100)]
MDL-26030 more mediaplugin fixes

Improved youtube id parsing, fixed url quoting and fixed unittests.

10 years agoMDL-25626 fix incorrect cm id in completion report
Petr Skoda [Sat, 12 Feb 2011 16:35:41 +0000 (17:35 +0100)]
MDL-25626 fix incorrect cm id in completion report

credit goes to Aaron Barnes

10 years agoMDL-26376 fix incorrect Shibboleth string and undefined property during first config...
Petr Skoda [Sat, 12 Feb 2011 16:00:36 +0000 (17:00 +0100)]
MDL-26376 fix incorrect Shibboleth string and undefined property during first config saving

10 years agoMDL-26380 improve perf of mediaplugin filter if no links found in text
Petr Skoda [Sat, 12 Feb 2011 15:48:32 +0000 (16:48 +0100)]
MDL-26380 improve perf of mediaplugin filter if no links found in text

10 years agoMDL-26351 add support for postgresql running with standard_conforming_strings
Petr Skoda [Sat, 12 Feb 2011 15:16:52 +0000 (16:16 +0100)]
MDL-26351 add support for postgresql running with standard_conforming_strings

10 years agoMDL-26030 update filter regex and create unittest for filter mediaplugin
Rossiani Wijaya [Sat, 12 Feb 2011 11:23:04 +0000 (12:23 +0100)]
MDL-26030 update filter regex and create unittest for filter mediaplugin

10 years agoMDL-26379 remove unused readme
Petr Skoda [Sat, 12 Feb 2011 10:11:44 +0000 (11:11 +0100)]
MDL-26379 remove unused readme

10 years agoMDL-26379 disable Minify URI builder and allow only execution of Minify from Moodle...
Petr Skoda [Sat, 12 Feb 2011 10:11:22 +0000 (11:11 +0100)]
MDL-26379 disable Minify URI builder and allow only execution of Minify from Moodle codebase

10 years agoMDL-26352 ignore invalid course_meta entries during upgrade
Petr Skoda [Sat, 12 Feb 2011 09:27:23 +0000 (10:27 +0100)]
MDL-26352 ignore invalid course_meta entries during upgrade

This fixes upgrade problems when course_meta points to deleted course or somebody hacked the table contents manually.

10 years agoMDL-26271 fix borked sql parameters in forum_search_posts and add missing modinfo...
Petr Skoda [Sat, 12 Feb 2011 09:11:27 +0000 (10:11 +0100)]
MDL-26271 fix borked sql parameters in forum_search_posts and add missing modinfo field

This is the perfect example why there must not be duplicate parameter names in SQL queries.

10 years agoMDL-26329 fix incorrect draft url rewriting when slasharguments off
Petr Skoda [Fri, 11 Feb 2011 09:57:33 +0000 (10:57 +0100)]
MDL-26329 fix incorrect draft url rewriting when slasharguments off

tinymce editor encodes '/' in the ?file= parameter, we have to decode %2F before doing our standard @@PLUGINFILE@@ processing.

10 years agoMDL-25553 lesson restore - add missing jumpto remapping. Credit goes to Mike Churchward
Eloy Lafuente (stronk7) [Sat, 12 Feb 2011 03:02:10 +0000 (04:02 +0100)]
MDL-25553 lesson restore - add missing jumpto remapping. Credit goes to Mike Churchward

10 years agoMDL-26353 Database activity module: display help icon with the new help strings
David Mudrak [Fri, 11 Feb 2011 22:20:16 +0000 (23:20 +0100)]
MDL-26353 Database activity module: display help icon with the new help strings

This commit makes the new strings added by Helen used at the Import
entries page. Note that the syntax of the strings had to be fixed as
there must not be leading whitespace before the asterisk in Markdown format.

Also as requested by Helen, the wording or export/import links is
improved now.

As a bonus for free, the patch fixes incorrect API usage of get_record()
and friends.

10 years agoMDL-26353 Database activity module new help string
Helen Foster [Thu, 10 Feb 2011 16:38:00 +0000 (17:38 +0100)]
MDL-26353 Database activity module new help string

10 years agoMDL-26322 always allow https in login local redirection test
Petr Skoda [Fri, 11 Feb 2011 10:23:06 +0000 (11:23 +0100)]
MDL-26322 always allow https in login local redirection test

This fixes problems for sites that use loginhtts where the redirection after login did not work for pages that require https such as the forgotten passowrds page.

10 years agoMDL-25991 add icon when action_link used in navigation
Petr Skoda [Fri, 11 Feb 2011 09:01:06 +0000 (10:01 +0100)]
MDL-25991 add icon when action_link used in navigation

Alos removing old TODO.

10 years agonavigation MDL-25991 Fixed reference to output in core_renderer
Sam Hemelryk [Fri, 11 Feb 2011 08:26:20 +0000 (16:26 +0800)]
navigation MDL-25991 Fixed reference to output in core_renderer

10 years agorating MDL-26274 made rating_ajax.php use the current scale rather than the scale...
andyjdavis [Fri, 11 Feb 2011 07:15:49 +0000 (15:15 +0800)]
rating MDL-26274 made rating_ajax.php use the current scale rather than the scale from the users previously submitted rating

10 years agoMDL-26356:Correcting the texts of Numerical Units grading select element
ppichet [Fri, 11 Feb 2011 04:50:30 +0000 (23:50 -0500)]
MDL-26356:Correcting the texts of Numerical Units grading select element

Signed-off-by: ppichet <pichet.pierre@uqam.ca>
10 years agoMDL-25215, file extension should remain unchanged when using save as field in filepic...
Dongsheng Cai [Wed, 9 Feb 2011 08:45:14 +0000 (16:45 +0800)]
MDL-25215, file extension should remain unchanged when using save as field in filepicker UI

10 years agoMDL-26338 fix mixed types in quiz reports SQL. This was breaking Oracle
Tim Hunt [Wed, 9 Feb 2011 20:48:21 +0000 (20:48 +0000)]
MDL-26338 fix mixed types in quiz reports SQL. This was breaking Oracle

10 years agoMDL-26333 dml - fix test (AS not in tables/views)
Eloy Lafuente (stronk7) [Wed, 9 Feb 2011 17:21:37 +0000 (18:21 +0100)]
MDL-26333 dml - fix test (AS not in tables/views)

10 years agoMDL-26333 ddl - better/safer temp column names
Eloy Lafuente (stronk7) [Wed, 9 Feb 2011 16:36:57 +0000 (17:36 +0100)]
MDL-26333 ddl - better/safer temp column names

10 years agoMDL-26332 cannot type Enter into a textarea in a quiz.
Tim Hunt [Wed, 9 Feb 2011 13:03:05 +0000 (13:03 +0000)]
MDL-26332 cannot type Enter into a textarea in a quiz.

This was breaking the essay question type.

10 years agoweekly release
Petr Skoda [Wed, 9 Feb 2011 11:26:58 +0000 (12:26 +0100)]
weekly release

10 years agoRevert "message MDL-26119 now logs when a user sends a message" because the log URL...
Sam Hemelryk [Wed, 9 Feb 2011 08:25:39 +0000 (16:25 +0800)]
Revert "message MDL-26119 now logs when a user sends a message" because the log URL generated is incorrect

This reverts commit 88c9987e8909d345e72c31a93cbfda61005a3cc5.

10 years agoMerge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 8 Feb 2011 09:21:55 +0000 (10:21 +0100)]
Merge branch 'MDL-24870_rss_error' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-24355_20_tagcorrelations_rev1' of git://github.com/samhemelryk...
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 23:11:40 +0000 (00:11 +0100)]
Merge branch 'MDL-24355_20_tagcorrelations_rev1' of git://github.com/samhemelryk/moodle

10 years agoMDL-26265 use cm_info in PAGE->cm because it has more useful information; add context...
Petr Skoda [Mon, 7 Feb 2011 21:32:06 +0000 (22:32 +0100)]
MDL-26265 use cm_info in PAGE->cm because it has more useful information; add context property to cm_info

10 years agoMerge branch 'MDL-26267' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 7 Feb 2011 22:07:16 +0000 (23:07 +0100)]
Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-26266' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 7 Feb 2011 22:05:08 +0000 (23:05 +0100)]
Merge branch 'MDL-26266' of git://github.com/samhemelryk/moodle

10 years agodml-sqlsrv MDL-26025 whitespace fix
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 21:33:26 +0000 (22:33 +0100)]
dml-sqlsrv MDL-26025 whitespace fix

10 years agoMerge branch 'MDL-26025' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 21:26:33 +0000 (22:26 +0100)]
Merge branch 'MDL-26025' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 21:21:21 +0000 (22:21 +0100)]
Merge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle

10 years agoMerge branch 'w06_MDL-26290_20_mysqlport' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 20:56:07 +0000 (21:56 +0100)]
Merge branch 'w06_MDL-26290_20_mysqlport' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-25780' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 7 Feb 2011 20:49:32 +0000 (21:49 +0100)]
Merge branch 'MDL-25780' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 20:41:04 +0000 (21:41 +0100)]
Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle

10 years agoMerge branch 'm20_MDL-25468_coding_error' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 7 Feb 2011 20:37:16 +0000 (21:37 +0100)]
Merge branch 'm20_MDL-25468_coding_error' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-21250-capitalized-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 7 Feb 2011 20:31:35 +0000 (21:31 +0100)]
Merge branch 'MDL-21250-capitalized-strings' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 7 Feb 2011 20:28:20 +0000 (21:28 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 19:22:29 +0000 (20:22 +0100)]
Merge branch 'w06_MDL-26219_20_upgradelog' of git://github.com/skodak/moodle