moodle.git
8 years agoMerge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 19 Feb 2013 05:48:12 +0000 (13:48 +0800)]
Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 19 Feb 2013 05:44:15 +0000 (13:44 +0800)]
Merge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https...
Dan Poltawski [Tue, 19 Feb 2013 05:41:45 +0000 (13:41 +0800)]
Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle

8 years agoMerge branch 'MDL-38047-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 19 Feb 2013 05:31:11 +0000 (13:31 +0800)]
Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 19 Feb 2013 04:36:40 +0000 (12:36 +0800)]
Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-31636 Comments - Call display callback when adding a new comment.
Damyon Wiese [Tue, 19 Feb 2013 03:11:40 +0000 (11:11 +0800)]
MDL-31636 Comments - Call display callback when adding a new comment.

8 years agoMDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_...
Aparup Banerjee [Mon, 18 Feb 2013 08:43:15 +0000 (16:43 +0800)]
MDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_display() for further time format changes.

8 years agoMDL-31636 redirect debugging to error log for ajax
Aparup Banerjee [Mon, 18 Feb 2013 08:40:22 +0000 (16:40 +0800)]
MDL-31636 redirect debugging to error log for ajax

8 years agoMerge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 19 Feb 2013 03:34:07 +0000 (11:34 +0800)]
Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38051' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 19 Feb 2013 03:23:39 +0000 (11:23 +0800)]
Merge branch 'MDL-38051' of git://github.com/jmvedrine/moodle

8 years agoMerge branch 'MDL-37934' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 19 Feb 2013 02:55:51 +0000 (10:55 +0800)]
Merge branch 'MDL-37934' of git://github.com/jmvedrine/moodle

8 years agoMDL-29938 Remove tabs (Grrr!)
Damyon Wiese [Tue, 19 Feb 2013 02:47:04 +0000 (10:47 +0800)]
MDL-29938 Remove tabs (Grrr!)

8 years agoMerge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 19 Feb 2013 02:33:50 +0000 (10:33 +0800)]
Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle

8 years agoMDL-29938 Version bump for webservices.
Damyon Wiese [Tue, 19 Feb 2013 02:31:25 +0000 (10:31 +0800)]
MDL-29938 Version bump for webservices.

8 years agoMerge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 19 Feb 2013 02:10:48 +0000 (10:10 +0800)]
Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)]
Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 18 Feb 2013 07:59:48 +0000 (15:59 +0800)]
Merge branch 'MDL-38039_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 18 Feb 2013 07:54:22 +0000 (15:54 +0800)]
Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle

8 years agoMDL-31983 navigation: Renaming the Settings block to Administration
Frederic Massart [Mon, 18 Feb 2013 07:48:12 +0000 (15:48 +0800)]
MDL-31983 navigation: Renaming the Settings block to Administration

AMOS BEGIN
 CPY [administration,core],[pluginname,block_settings]
AMOS END

8 years agoMerge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle
Damyon Wiese [Mon, 18 Feb 2013 06:51:50 +0000 (14:51 +0800)]
Merge branch 'MDL-37687_comments_ajax_fix' of git://github.com/nebgor/moodle

8 years agoMerge branch 'MDL-37396' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 18 Feb 2013 06:22:02 +0000 (14:22 +0800)]
Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 18 Feb 2013 06:18:25 +0000 (14:18 +0800)]
Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 18 Feb 2013 05:35:36 +0000 (13:35 +0800)]
Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle

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

8 years agoMDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable...
Rossiani Wijaya [Mon, 18 Feb 2013 05:22:07 +0000 (13:22 +0800)]
MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js

8 years agoMerge branch 'MDL-35336' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 18 Feb 2013 04:23:51 +0000 (12:23 +0800)]
Merge branch 'MDL-35336' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-37337-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 18 Feb 2013 04:00:45 +0000 (12:00 +0800)]
Merge branch 'MDL-37337-master' of git://github.com/damyon/moodle

8 years agoMDL-35622 - fix crazy character causing upgrade problems
Dan Poltawski [Mon, 18 Feb 2013 03:55:29 +0000 (11:55 +0800)]
MDL-35622 - fix crazy character causing upgrade problems

Can you see it?!

8 years agoMerge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 18 Feb 2013 03:31:07 +0000 (11:31 +0800)]
Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle

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

8 years agoMerge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 18 Feb 2013 03:07:28 +0000 (11:07 +0800)]
Merge branch 'MDL-34800_ajax_submit' of git://github.com/andyjdavis/moodle

8 years agoMDL-37683 cache: - Comments cleanup and remove ;;
Damyon Wiese [Mon, 18 Feb 2013 02:34:30 +0000 (10:34 +0800)]
MDL-37683 cache: - Comments cleanup and remove ;;

8 years agoMDL-37396 User Enrollment: fixed missing user from enrolment sub-menu
Rossiani Wijaya [Tue, 12 Feb 2013 08:42:51 +0000 (16:42 +0800)]
MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu

8 years agoMDL-35336 report (course overview): check the setting for enablestats before printing...
Rossiani Wijaya [Wed, 13 Feb 2013 03:02:22 +0000 (11:02 +0800)]
MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports

8 years agoMDL-35336 Report (course overview): fixed redirect url to enable statistics setting...
Rossiani Wijaya [Mon, 11 Feb 2013 05:07:47 +0000 (13:07 +0800)]
MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable

8 years agoMerge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 18 Feb 2013 01:30:47 +0000 (09:30 +0800)]
Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle

8 years agoMDL-37683 cache: improved indentifier collection and storage
Sam Hemelryk [Sun, 17 Feb 2013 21:20:02 +0000 (10:20 +1300)]
MDL-37683 cache: improved indentifier collection and storage

8 years agoMDL-38000 css: fixed handling of CSS files by outputlib.
Sam Hemelryk [Wed, 13 Feb 2013 01:47:24 +0000 (14:47 +1300)]
MDL-38000 css: fixed handling of CSS files by outputlib.

8 years agoMDL-37683 cache: siteidentifier is now included in the keys
Sam Hemelryk [Wed, 6 Feb 2013 00:45:17 +0000 (13:45 +1300)]
MDL-37683 cache: siteidentifier is now included in the keys

8 years agoMDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly
Andrew Robert Nicols [Tue, 12 Feb 2013 11:14:14 +0000 (11:14 +0000)]
MDL-37939 Course: Add additional unit tests to confirm that module move occurs correctly

8 years agoMDL-37939 Course: Correct broken sequence data
Andrew Robert Nicols [Tue, 12 Feb 2013 00:20:12 +0000 (00:20 +0000)]
MDL-37939 Course: Correct broken sequence data

8 years agoMDL-38051 Annihilate all the CRLFs present in some questions/fixtures...
Jean-Michel Vedrine [Fri, 15 Feb 2013 17:26:38 +0000 (18:26 +0100)]
MDL-38051 Annihilate all the CRLFs present in some questions/fixtures...

8 years agoMDL-36380 stats: No more duplicated entries when viewing monthly stats
Frederic Massart [Thu, 7 Feb 2013 03:11:05 +0000 (11:11 +0800)]
MDL-36380 stats: No more duplicated entries when viewing monthly stats

8 years agoMDL-37858 behat: Testing the step arguments replacements
David Monllao [Fri, 8 Feb 2013 08:20:05 +0000 (16:20 +0800)]
MDL-37858 behat: Testing the step arguments replacements

8 years agoMDL-37858 behat: Arguments transformations
David Monllao [Fri, 8 Feb 2013 08:17:01 +0000 (16:17 +0800)]
MDL-37858 behat: Arguments transformations

To remove the escape characters and to
replace var names for nasty strings

8 years agoMDL-37858 testing: Adding nasty strings generator
David Monllao [Fri, 8 Feb 2013 08:13:41 +0000 (16:13 +0800)]
MDL-37858 testing: Adding nasty strings generator

8 years agoMDL-37858 behat: Removing fixStepArgument
David Monllao [Fri, 8 Feb 2013 05:31:36 +0000 (13:31 +0800)]
MDL-37858 behat: Removing fixStepArgument

It can be managed by a @Transform in
a centralized way

8 years agoMDL-37912 behat: Use text area if there is no html editor
David Monllao [Thu, 7 Feb 2013 03:00:02 +0000 (11:00 +0800)]
MDL-37912 behat: Use text area if there is no html editor

8 years agoMDL-38048 documentation: Typo in README file
Frederic Massart [Fri, 15 Feb 2013 05:14:39 +0000 (13:14 +0800)]
MDL-38048 documentation: Typo in README file

8 years agoMDL-31983 navigation: Move reports from Navigation to Settings
Frederic Massart [Fri, 15 Feb 2013 05:06:26 +0000 (13:06 +0800)]
MDL-31983 navigation: Move reports from Navigation to Settings

8 years agoMDL-38047 Assignment unit tests - Shave 1 minute from the unit tests for mod_assign.
Damyon Wiese [Fri, 15 Feb 2013 04:36:21 +0000 (12:36 +0800)]
MDL-38047 Assignment unit tests - Shave 1 minute from the unit tests for mod_assign.

8 years agoMDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy"
Damyon Wiese [Tue, 8 Jan 2013 07:49:03 +0000 (15:49 +0800)]
MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy"

8 years agoMDL-29938 throw exception when a criteria is repeated, used self instead classname...
Jerome Mouneyrac [Fri, 15 Feb 2013 03:03:13 +0000 (11:03 +0800)]
MDL-29938 throw exception when a criteria is repeated, used self instead classname when possible, return only not deleted users

8 years agoMDL-38040 Clean core from CRLFs
Eloy Lafuente (stronk7) [Fri, 15 Feb 2013 01:13:32 +0000 (02:13 +0100)]
MDL-38040 Clean core from CRLFs

8 years agoMDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which...
Mary Evans [Fri, 15 Feb 2013 00:48:08 +0000 (00:48 +0000)]
MDL-38039 theme_base: Corrected typo fickering to flickering in CSS comment which blocked IPCOP browser firewall in IE.

8 years agoMDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918)
Matteo Scaramuccia [Thu, 14 Feb 2013 20:38:05 +0000 (21:38 +0100)]
MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918)

8 years agoMDL-33774 Reset filters caches between unit tests
Marina Glancy [Thu, 14 Feb 2013 02:17:39 +0000 (13:17 +1100)]
MDL-33774 Reset filters caches between unit tests

8 years agoMDL-33774 filter_activitynames removed hardcoded label module type
Marina Glancy [Wed, 23 Jan 2013 04:48:24 +0000 (15:48 +1100)]
MDL-33774 filter_activitynames removed hardcoded label module type

8 years agoMDL-33774 instead of checking that activity is label we check that it has view url
Marina Glancy [Fri, 18 Jan 2013 05:44:16 +0000 (16:44 +1100)]
MDL-33774 instead of checking that activity is label we check that it has view url

8 years agoMDL-33774 mod_label stores the content where it is supposed to
Marina Glancy [Fri, 18 Jan 2013 06:25:58 +0000 (17:25 +1100)]
MDL-33774 mod_label stores the content where it is supposed to

removed hardcoded checking for 'label' module type

changed label update script

8 years agoMDL-38029 behat: Cleaning caches before each test
David Monllao [Thu, 14 Feb 2013 08:33:33 +0000 (16:33 +0800)]
MDL-38029 behat: Cleaning caches before each test

8 years agoMDL-38009 behat: Reset cachedir and tempdir
David Monllao [Wed, 13 Feb 2013 08:53:45 +0000 (16:53 +0800)]
MDL-38009 behat: Reset cachedir and tempdir

8 years agoMDL-37934 Blackboard_six question import fails in some cases
Jean-Michel Vedrine [Mon, 11 Feb 2013 13:51:21 +0000 (14:51 +0100)]
MDL-37934 Blackboard_six question import fails in some cases
Import fails if the same image is used several times
in the same field of the same question

8 years agoweekly release 2.5dev
Damyon Wiese [Thu, 14 Feb 2013 05:46:04 +0000 (13:46 +0800)]
weekly release 2.5dev

8 years agoFix permissions
Damyon Wiese [Thu, 14 Feb 2013 05:43:58 +0000 (13:43 +0800)]
Fix permissions

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Thu, 14 Feb 2013 05:37:48 +0000 (13:37 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Feb 2013 00:49:54 +0000 (00:49 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-37883-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 13 Feb 2013 07:47:27 +0000 (15:47 +0800)]
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle

8 years agoMDL-37883 Assignment Grade import/export. Additional fix to prevent different grade...
Damyon Wiese [Wed, 13 Feb 2013 06:54:24 +0000 (14:54 +0800)]
MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export.

8 years agoMerge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle
Damyon Wiese [Wed, 13 Feb 2013 07:04:51 +0000 (15:04 +0800)]
Merge branch 'MDL-37750_master-add-seconds' of git://github.com/dmonllao/moodle

8 years agoMDL-37750 behat: More time for AJAX-related actions
David Monllao [Wed, 13 Feb 2013 05:19:56 +0000 (13:19 +0800)]
MDL-37750 behat: More time for AJAX-related actions

When we want to assert against data coming
from an AJAX request with 1 second we don't
have enough time to ensure the elements are
loaded

8 years agoMDL-30637 - fix padding on show/collapse arrow
Dan Poltawski [Wed, 13 Feb 2013 03:43:36 +0000 (11:43 +0800)]
MDL-30637 - fix padding on show/collapse arrow

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 13 Feb 2013 00:45:39 +0000 (00:45 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 21:49:05 +0000 (22:49 +0100)]
Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle

8 years agoMDL-37997 Improve the display of MUC caches used in the footer
David Mudrák [Tue, 12 Feb 2013 21:27:55 +0000 (22:27 +0100)]
MDL-37997 Improve the display of MUC caches used in the footer

Cache stores with no hits and some misses are highlighted in red. Caches
stores with some hits but more misses are highlighted in yellow.
Otherwise (more hits than misses) the stores are highlighted in green.

8 years agoMerge branch 'MDL-37953_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:12:01 +0000 (10:12 +0100)]
Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:07:58 +0000 (10:07 +0100)]
Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle

8 years agoMDL-37893 Take rid of old comment.
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:03:29 +0000 (10:03 +0100)]
MDL-37893 Take rid of old comment.

8 years agoMerge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 12 Feb 2013 09:02:23 +0000 (10:02 +0100)]
Merge branch 'MDL-37893-grouped-empty' of git://github.com/mudrd8mz/moodle

8 years agoMDL-37687 use $SITE to allow non-logged-in users to browse comment via ajax
Aparup Banerjee [Tue, 12 Feb 2013 08:19:40 +0000 (16:19 +0800)]
MDL-37687 use $SITE to allow non-logged-in users to browse comment via ajax

8 years agoMerge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 12 Feb 2013 08:13:48 +0000 (16:13 +0800)]
Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 12 Feb 2013 07:48:33 +0000 (15:48 +0800)]
Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle

Conflicts:
mod/forum/db/upgrade.php
mod/forum/version.php

8 years agoMerge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 12 Feb 2013 07:44:17 +0000 (15:44 +0800)]
Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 12 Feb 2013 07:08:53 +0000 (15:08 +0800)]
Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle

8 years agoMDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability...
Rajesh Taneja [Thu, 31 Jan 2013 06:01:41 +0000 (14:01 +0800)]
MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default

8 years agoMerge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:48:40 +0000 (14:48 +0800)]
Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle

Conflicts:
course/tests/behat/add_activities.feature

8 years agoMerge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:47:50 +0000 (14:47 +0800)]
Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)]
Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 12 Feb 2013 06:15:29 +0000 (14:15 +0800)]
Merge branch 'wip-mdl-20131' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-37750 behat: Removing (now) collapsed elements
David Monllao [Tue, 12 Feb 2013 06:06:51 +0000 (14:06 +0800)]
MDL-37750 behat: Removing (now) collapsed elements

8 years agoMerge branch 'MDL-37883-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 12 Feb 2013 05:47:37 +0000 (13:47 +0800)]
Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-37074-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 12 Feb 2013 05:39:07 +0000 (13:39 +0800)]
Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle

8 years agoMDL-37924 quiz settings: change wrong 'fix' => 'adv'.
Tim Hunt [Thu, 7 Feb 2013 17:46:55 +0000 (17:46 +0000)]
MDL-37924 quiz settings: change wrong 'fix' => 'adv'.

8 years agoMerge branch 'MDL-37654_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 12 Feb 2013 05:09:18 +0000 (13:09 +0800)]
Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 12 Feb 2013 04:12:44 +0000 (12:12 +0800)]
Merge branch 'MDL-37164_message_self' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 12 Feb 2013 03:40:40 +0000 (11:40 +0800)]
Merge branch 'MDL-37828_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-20131 Glossary: Fixed courseid typo
Rajesh Taneja [Tue, 12 Feb 2013 02:11:32 +0000 (10:11 +0800)]
MDL-20131 Glossary: Fixed courseid typo

8 years agoMerge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle
Dan Poltawski [Tue, 12 Feb 2013 02:34:07 +0000 (10:34 +0800)]
Merge branch 'wip-MDL-34798_master-2' of git://github.com/gjb2048/moodle

8 years agoMDL-37953 mod_forum: using named parameters to build SQL statement
Mark Nelson [Mon, 11 Feb 2013 03:51:41 +0000 (11:51 +0800)]
MDL-37953 mod_forum: using named parameters to build SQL statement

8 years agoMerge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)]
Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php

8 years agoMDL-37976 fixed missing global
Marina Glancy [Tue, 12 Feb 2013 01:53:47 +0000 (12:53 +1100)]
MDL-37976 fixed missing global

8 years agoMerge branch 'MDL-37952' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 12 Feb 2013 01:45:38 +0000 (09:45 +0800)]
Merge branch 'MDL-37952' of git://github.com/stronk7/moodle