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

10 years agoMDL-26219 fix borked upgrade logging and add new fileversion column
Petr Skoda [Thu, 3 Feb 2011 09:07:13 +0000 (10:07 +0100)]
MDL-26219 fix borked upgrade logging and add new fileversion column

10 years agoMDL-21250 capital letters removal
Helen Foster [Mon, 7 Feb 2011 14:55:18 +0000 (15:55 +0100)]
MDL-21250 capital letters removal

10 years agoMerge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 7 Feb 2011 14:53:15 +0000 (15:53 +0100)]
Merge branch 'MDL-17357-duplicate-strings' of git://github.com/mudrd8mz/moodle

10 years agoMDL-17357 Removed duplicate string definitions
David Mudrak [Mon, 7 Feb 2011 14:08:07 +0000 (15:08 +0100)]
MDL-17357 Removed duplicate string definitions

10 years agoMerge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 7 Feb 2011 09:58:12 +0000 (17:58 +0800)]
Merge branch 'PULL-226-workshop' of git://github.com/mudrd8mz/moodle

10 years agoMDL-26298 Workshop: fixed trivial typos in phpDoc blocks
David Mudrak [Tue, 18 Jan 2011 12:11:02 +0000 (13:11 +0100)]
MDL-26298 Workshop: fixed trivial typos in phpDoc blocks

10 years agoMDL-26296 Workshop: trivial change in manual allocator CSS
David Mudrak [Fri, 4 Feb 2011 13:37:09 +0000 (14:37 +0100)]
MDL-26296 Workshop: trivial change in manual allocator CSS

When only two rows of the allocations table are displayed with the new
allocation highlighted, it is better not highlight the odd row.

10 years agoMerge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Feb 2011 08:31:38 +0000 (16:31 +0800)]
Merge branch 'w06_MDL-26262_20_onlineblock' of git://github.com/skodak/moodle

10 years agoAutomatic installer lang files (20110207)
AMOS bot [Mon, 7 Feb 2011 08:27:45 +0000 (09:27 +0100)]
Automatic installer lang files (20110207)

10 years agoNAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_activ...
Dongsheng Cai [Mon, 7 Feb 2011 08:25:58 +0000 (16:25 +0800)]
NAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_active_url to help find the correct node

10 years agoMerge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Feb 2011 08:20:02 +0000 (16:20 +0800)]
Merge branch 'w06_MDL-26238_20_group' of git://github.com/skodak/moodle

10 years agoMerge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Feb 2011 08:11:50 +0000 (16:11 +0800)]
Merge branch 'w06_MDL-26221_20_courserole' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26272' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 7 Feb 2011 08:03:27 +0000 (16:03 +0800)]
Merge branch 'MDL-26272' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 7 Feb 2011 07:41:26 +0000 (15:41 +0800)]
Merge branch 'MDL-26245-typo_in_exception_string' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 7 Feb 2011 07:32:23 +0000 (15:32 +0800)]
Merge branch 'MDL-26252-import-groups-help' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 7 Feb 2011 07:16:40 +0000 (15:16 +0800)]
Merge branch 'MDL-26119_message_logging' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26242' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 7 Feb 2011 07:13:53 +0000 (15:13 +0800)]
Merge branch 'MDL-26242' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-25639' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 7 Feb 2011 06:21:24 +0000 (14:21 +0800)]
Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25874' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 7 Feb 2011 06:01:00 +0000 (14:01 +0800)]
Merge branch 'MDL-25874' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle
Sam Hemelryk [Mon, 7 Feb 2011 05:50:36 +0000 (13:50 +0800)]
Merge branch 'm20_MDL-25671_data_template_editor' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-25939'
Sam Hemelryk [Mon, 7 Feb 2011 05:40:51 +0000 (13:40 +0800)]
Merge branch 'MDL-25939'

10 years agoMDL-25939 Fixed whitespace issues in the splash theme
Sam Hemelryk [Mon, 7 Feb 2011 05:40:43 +0000 (13:40 +0800)]
MDL-25939 Fixed whitespace issues in the splash theme

10 years agomod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going...
Sam Hemelryk [Mon, 7 Feb 2011 05:20:09 +0000 (13:20 +0800)]
mod-workshop MDL-26267 workshop_extend_navigation argument 4 is now always going to be a cm_info object

10 years agonavigation MDL-26266 Refactored code to ensure when loading activities is a cm_info...
Sam Hemelryk [Mon, 7 Feb 2011 04:16:13 +0000 (12:16 +0800)]
navigation MDL-26266 Refactored code to ensure  when loading activities is a cm_info object

10 years agodml-sqlsrv MDL-26025 Fixed up typo in simpletests and added a couple more tests
Sam Hemelryk [Mon, 7 Feb 2011 03:23:30 +0000 (11:23 +0800)]
dml-sqlsrv MDL-26025 Fixed up typo in simpletests and added a couple more tests

10 years agodml-sqlsrv MDL-26025 Removed use of property to track rownumber field in favor of...
Sam Hemelryk [Mon, 7 Feb 2011 02:46:50 +0000 (10:46 +0800)]
dml-sqlsrv MDL-26025 Removed use of property to track rownumber field in favor of always unsetting it

10 years agosqlsrv MDL-26025 Fixed up numerous issues with the limit_to_top_n function
Sam Hemelryk [Tue, 25 Jan 2011 09:13:00 +0000 (17:13 +0800)]
sqlsrv MDL-26025 Fixed up numerous issues with the limit_to_top_n function

10 years agoMDL-26256 detect missing collator support and use workaround instead
Petr Skoda [Sun, 6 Feb 2011 21:27:25 +0000 (22:27 +0100)]
MDL-26256 detect missing collator support and use workaround instead

10 years agoMDL-26290 add experimental windows mysqli named pipe support
Petr Skoda [Sun, 6 Feb 2011 21:11:28 +0000 (22:11 +0100)]
MDL-26290 add experimental windows mysqli named pipe support

10 years agoMDL-26262 fix online users block error on non-course pages
Petr Skoda [Sun, 6 Feb 2011 21:04:44 +0000 (22:04 +0100)]
MDL-26262 fix online users block error on non-course pages

10 years agoMDL-26290 make sure ini_get('mysqli.default_port') returns number
Petr Skoda [Sun, 6 Feb 2011 20:15:40 +0000 (21:15 +0100)]
MDL-26290 make sure ini_get('mysqli.default_port') returns number

10 years agoMDL-26234 fix fatal user upload error when custom text area field present
Petr Skoda [Sun, 6 Feb 2011 19:57:21 +0000 (20:57 +0100)]
MDL-26234 fix fatal user upload error when custom text area field present

Please note this does not fix problems with the actual upload of custon text area fields.

10 years agoMDL-26238 remove deprecated second parameter from groups_get_group() calls
Charles Fulton [Sun, 6 Feb 2011 17:15:36 +0000 (18:15 +0100)]
MDL-26238 remove deprecated second parameter from groups_get_group() calls

10 years agoMDL-26221 add missing course/lib.php include when using make_categories_list()
Petr Skoda [Sun, 6 Feb 2011 16:58:47 +0000 (17:58 +0100)]
MDL-26221 add missing course/lib.php include when using make_categories_list()

10 years agoMDL-26272 ratings - fix uses breaking after last modinfo changes
Eloy Lafuente (stronk7) [Fri, 4 Feb 2011 16:30:51 +0000 (17:30 +0100)]
MDL-26272 ratings - fix uses breaking after last modinfo changes

10 years agoMDL-26188 Workshop: get rid of a method that is not used anyway
David Mudrak [Fri, 4 Feb 2011 13:33:48 +0000 (14:33 +0100)]
MDL-26188 Workshop: get rid of a method that is not used anyway

The protected method get_allocations_recordset() is a relict from
earlier development phases of Workshop module. Removing it as it
confuses recent Eloy's recordset usage detection tool.

10 years agoFixed import groups page layout and navigation
David Mudrak [Thu, 3 Feb 2011 11:28:28 +0000 (12:28 +0100)]
Fixed import groups page layout and navigation

While working on MDL-26252, I realized that group/import.php page had
issues with layout. Side blocks were missing and the breadcrumb navigation
broken (leading to a non-existing script and having the link to the
current course duplicated).

This patch sets the standard layout for the page so that block are
displayed, fixes the page position in the navigation tree and the
breadcrumb navigation.

10 years agoMDL-26252 Added help icon at import groups page
David Mudrak [Thu, 3 Feb 2011 11:02:06 +0000 (12:02 +0100)]
MDL-26252 Added help icon at import groups page

AMOS BEGIN
 MOV [importgroups,core],[importgroups,core_group]
AMOS END

10 years agoMDL-26245 Fixed typo in dbtransfer exception string
David Mudrak [Thu, 3 Feb 2011 10:45:07 +0000 (11:45 +0100)]
MDL-26245 Fixed typo in dbtransfer exception string

10 years agoemergency weekly release
Petr Skoda [Fri, 4 Feb 2011 08:31:15 +0000 (09:31 +0100)]
emergency weekly release

fixes fatal error in mod/workshop and other places caused by missing backwards compatibility with old cminfo stdClass

10 years agolib-modinfolib MDL-26264 cm_info and course_modinfo classes both now extend stdClass
Sam Hemelryk [Fri, 4 Feb 2011 08:22:57 +0000 (16:22 +0800)]
lib-modinfolib MDL-26264 cm_info and course_modinfo classes both now extend stdClass

10 years agorss MDL-24870 fixed the capability checks to access module rss feeds
andyjdavis [Fri, 4 Feb 2011 02:27:52 +0000 (10:27 +0800)]
rss MDL-24870 fixed the capability checks to access module rss feeds

10 years agorss MDL-24870 latest news block was supplying the wrong context ID when creating...
andyjdavis [Thu, 3 Feb 2011 07:24:27 +0000 (15:24 +0800)]
rss MDL-24870 latest news block was supplying the wrong context ID when creating its RSS feed link

10 years agomessage MDL-26119 now logs when a user sends a message
andyjdavis [Wed, 2 Feb 2011 09:48:25 +0000 (17:48 +0800)]
message MDL-26119 now logs when a user sends a message

10 years agotags MDL-24355 Improved computation of tag correlations. Thanks Jonathan Robson for...
Sam Hemelryk [Fri, 28 Jan 2011 04:15:14 +0000 (12:15 +0800)]
tags MDL-24355 Improved computation of tag correlations. Thanks Jonathan Robson for the 1.9 patch.

10 years agoMDL-26242 quiz reports. No students in course => get_in_or_equal doesn't like empty...
Tim Hunt [Wed, 2 Feb 2011 16:40:14 +0000 (16:40 +0000)]
MDL-26242 quiz reports. No students in course => get_in_or_equal doesn't like empty arrays error

10 years agomod-data MDL-25671 disable editor in data list template editor will not save the...
Dongsheng Cai [Wed, 2 Feb 2011 07:46:11 +0000 (15:46 +0800)]
mod-data MDL-25671 disable editor in data list template editor will not save the changes

10 years agoweekly release
Petr Skoda [Wed, 2 Feb 2011 13:10:02 +0000 (14:10 +0100)]
weekly release

10 years agoMDL-25834 revert unresolved PULL-174
Petr Skoda [Wed, 2 Feb 2011 13:03:44 +0000 (14:03 +0100)]
MDL-25834 revert unresolved PULL-174

10 years agoMerge branch 'MDL-26237' of git://github.com/stronk7/moodle
Petr Skoda [Wed, 2 Feb 2011 12:49:16 +0000 (13:49 +0100)]
Merge branch 'MDL-26237' of git://github.com/stronk7/moodle

10 years agoMDL-26237 code coverage - prevent execution of not used stuff
Eloy Lafuente (stronk7) [Wed, 2 Feb 2011 10:21:01 +0000 (11:21 +0100)]
MDL-26237 code coverage - prevent execution of not used stuff

10 years agoMDL-25942 fix another Oracle compatibility issue
Petr Skoda [Wed, 2 Feb 2011 08:59:56 +0000 (09:59 +0100)]
MDL-25942 fix another Oracle compatibility issue

10 years agoMDL-26201 fix Lang - Thanks Petr
Dan Marsden [Tue, 1 Feb 2011 20:08:17 +0000 (09:08 +1300)]
MDL-26201 fix Lang - Thanks Petr

10 years agoMDL-26177 compare 255 chars when checking custom field uniqueness
Petr Skoda [Wed, 2 Feb 2011 08:15:42 +0000 (09:15 +0100)]
MDL-26177 compare 255 chars when checking custom field uniqueness

10 years agoblog MDL-25981 PULL-162 Removed typehinting in blog after changed from stdClass...
Sam Hemelryk [Wed, 2 Feb 2011 02:37:33 +0000 (10:37 +0800)]
blog MDL-25981 PULL-162 Removed typehinting in blog after  changed from stdClass to cm_info

10 years agoMDL-26177 fix non-working unique custom field check
Petr Skoda [Tue, 1 Feb 2011 13:34:31 +0000 (14:34 +0100)]
MDL-26177 fix non-working unique custom field check

10 years agoMDL-25791 quiz - bump version
Eloy Lafuente (stronk7) [Tue, 1 Feb 2011 08:37:36 +0000 (09:37 +0100)]
MDL-25791 quiz - bump version

10 years agoMerge branch 'MDL-25791_20_quizdb_rev1' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 1 Feb 2011 08:35:49 +0000 (09:35 +0100)]
Merge branch 'MDL-25791_20_quizdb_rev1' of git://github.com/samhemelryk/moodle

10 years agomod-quiz MDL-25791 Fixed database discrepancies between a fresh install and an upgrad...
Sam Hemelryk [Tue, 1 Feb 2011 04:54:16 +0000 (12:54 +0800)]
mod-quiz MDL-25791 Fixed database discrepancies between a fresh install and an upgraded site within the Quiz module

10 years agoMerge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng...
Eloy Lafuente (stronk7) [Tue, 1 Feb 2011 00:53:47 +0000 (01:53 +0100)]
Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-25981'
Petr Skoda [Mon, 31 Jan 2011 21:44:17 +0000 (22:44 +0100)]
Merge branch 'MDL-25981'

10 years agoMDL-25981 fix inverted instanceof in require_login
Petr Skoda [Mon, 31 Jan 2011 21:35:17 +0000 (22:35 +0100)]
MDL-25981 fix inverted instanceof in require_login

10 years agoMDL-25981 add missing global DB when fetching course modinfo
Petr Skoda [Mon, 31 Jan 2011 21:23:34 +0000 (22:23 +0100)]
MDL-25981 add missing global DB when fetching course modinfo

10 years agoMDL-25981 make sure cm is defined
Petr Skoda [Mon, 31 Jan 2011 21:19:36 +0000 (22:19 +0100)]
MDL-25981 make sure cm is defined

10 years agoMerge branch 'w05_MDL-26034_20_myprofile' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 19:10:27 +0000 (20:10 +0100)]
Merge branch 'w05_MDL-26034_20_myprofile' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26098' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 31 Jan 2011 18:25:41 +0000 (19:25 +0100)]
Merge branch 'MDL-26098' of git://github.com/timhunt/moodle

10 years agoMDL-26201 scorm & js - CSS changes => version bump
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 18:23:31 +0000 (19:23 +0100)]
MDL-26201 scorm & js - CSS changes => version bump

10 years agoMerge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 18:14:55 +0000 (19:14 +0100)]
Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 17:02:02 +0000 (18:02 +0100)]
Merge branch 'w05_MDL-26046_20_noemailever' of git://github.com/skodak/moodle

10 years agoTake out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com...
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 16:43:22 +0000 (17:43 +0100)]
Take out debugging & merge branch 'w05_MDL-26198_20_completion' of git://github.com/skodak/moodle

10 years agoMerge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 16:17:48 +0000 (17:17 +0100)]
Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle

10 years agoMerge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 15:17:13 +0000 (16:17 +0100)]
Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle

10 years agoMerge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 15:02:51 +0000 (16:02 +0100)]
Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle

10 years agoMerge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 15:01:02 +0000 (16:01 +0100)]
Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle

10 years agoFixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 14:34:40 +0000 (15:34 +0100)]
Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 14:17:33 +0000 (15:17 +0100)]
Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle

10 years agoMerge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 31 Jan 2011 13:57:22 +0000 (14:57 +0100)]
Merge branch 'w05_MDL-26189_20_imse' of git://github.com/skodak/moodle

10 years agoMerge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 31 Jan 2011 13:26:03 +0000 (14:26 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-25708' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 31 Jan 2011 13:21:53 +0000 (14:21 +0100)]
Merge branch 'MDL-25708' of git://github.com/stronk7/moodle

10 years agoMDL-25939-2 Updated fix for Splah theme blog labels
stabijoh [Mon, 31 Jan 2011 12:23:49 +0000 (07:23 -0500)]
MDL-25939-2 Updated fix for Splah theme blog labels