moodle.git
8 years agoMDL-37533 Assign: Use the constant for the submitted status in the query (and paramet...
Damyon Wiese [Thu, 24 Jan 2013 02:52:20 +0000 (10:52 +0800)]
MDL-37533 Assign: Use the constant for the submitted status in the query (and parameterize the query)

8 years agoMDL-37533 Assign: assign_print_overview does not correctly display assignments that...
Stephen Bourget [Mon, 21 Jan 2013 16:32:04 +0000 (11:32 -0500)]
MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading

8 years agoMerge branch 'MDL-37547-master' of github.com:damyon/moodle
Dan Poltawski [Wed, 23 Jan 2013 07:58:34 +0000 (15:58 +0800)]
Merge branch 'MDL-37547-master' of github.com:damyon/moodle

8 years agoMDL-37082 core_course: include details of deprecation in the upgrade.txt file
Mark Nelson [Wed, 23 Jan 2013 07:48:50 +0000 (15:48 +0800)]
MDL-37082 core_course: include details of deprecation in the upgrade.txt file

8 years agoMerge branch 'MDL-37082-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 23 Jan 2013 07:53:20 +0000 (15:53 +0800)]
Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle

8 years agoMDL-37082: Fixed failed unit tests from previous patch
Damyon Wiese [Wed, 23 Jan 2013 07:18:46 +0000 (15:18 +0800)]
MDL-37082: Fixed failed unit tests from previous patch

8 years agoMerge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Wed, 23 Jan 2013 06:57:45 +0000 (14:57 +0800)]
Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle

Conflicts:
version.php

8 years agoMDL-37547 Assign: Fix failed unit test on oracle.
Damyon Wiese [Wed, 23 Jan 2013 06:56:21 +0000 (14:56 +0800)]
MDL-37547 Assign: Fix failed unit test on oracle.

Oracle is rounding numbers with no decimals - which causes a test failure.

8 years agoMerge branch 'MDL-37082_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 23 Jan 2013 06:45:59 +0000 (14:45 +0800)]
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle

8 years agoMDL-37082 mod_assign: removed reference to deprecated delete_course_module function...
Mark Nelson [Wed, 23 Jan 2013 06:25:02 +0000 (14:25 +0800)]
MDL-37082 mod_assign: removed reference to deprecated delete_course_module function in the unit tests

8 years agoMDL-37458 testing: Removing wrong comments
David Monllao [Wed, 23 Jan 2013 05:23:08 +0000 (13:23 +0800)]
MDL-37458 testing: Removing wrong comments

8 years agoMerge branch 'MDL-37619-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)]
Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-37506' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 23 Jan 2013 00:54:32 +0000 (08:54 +0800)]
Merge branch 'MDL-37506' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37082_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 23 Jan 2013 00:53:02 +0000 (08:53 +0800)]
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 22 Jan 2013 22:08:55 +0000 (11:08 +1300)]
Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php

8 years agoMerge branch 'wip-MDL-35826-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 22 Jan 2013 21:03:42 +0000 (10:03 +1300)]
Merge branch 'wip-MDL-35826-master' of git://github.com/phalacee/moodle

Conflicts:
calendar/upgrade.txt

8 years agoMDL-36621 cache: added missing calendar subscription string
Sam Hemelryk [Tue, 22 Jan 2013 20:58:43 +0000 (09:58 +1300)]
MDL-36621 cache: added missing calendar subscription string

8 years agoMerge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 22 Jan 2013 20:54:36 +0000 (09:54 +1300)]
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)]
Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle

8 years agoMDL-29749 phpunit: Windows dir uses backslashes
Frederic Massart [Tue, 22 Jan 2013 01:41:25 +0000 (09:41 +0800)]
MDL-29749 phpunit: Windows dir uses backslashes

8 years agoMDL-37100 Version bump
Ankit Agarwal [Tue, 22 Jan 2013 09:10:31 +0000 (17:10 +0800)]
MDL-37100 Version bump

8 years agoMDL-37082 core_course: create new course_delete_module function that handles the...
Mark Nelson [Mon, 10 Dec 2012 09:33:09 +0000 (17:33 +0800)]
MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process

Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.

8 years agoMerge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 22 Jan 2013 08:28:31 +0000 (16:28 +0800)]
Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-36602 - fix whitespace
Dan Poltawski [Tue, 22 Jan 2013 07:45:34 +0000 (15:45 +0800)]
MDL-36602 - fix whitespace

8 years agoMerge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Jan 2013 07:44:28 +0000 (15:44 +0800)]
Merge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle

8 years agoMerge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Jan 2013 07:37:36 +0000 (15:37 +0800)]
Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 22 Jan 2013 06:00:26 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-37547-master' of github.com:damyon/moodle
Aparup Banerjee [Tue, 22 Jan 2013 05:57:25 +0000 (13:57 +0800)]
Merge branch 'MDL-37547-master' of github.com:damyon/moodle

8 years agoMDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api
Ankit Agarwal [Fri, 18 Jan 2013 03:05:07 +0000 (11:05 +0800)]
MDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api

8 years agoMDL-35826 - Calendar - Creating a caption containing the month name for mini-calendars
Jason Fowler [Thu, 10 Jan 2013 03:11:12 +0000 (11:11 +0800)]
MDL-35826 - Calendar - Creating a caption containing the month name for mini-calendars

8 years agoMerge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Tue, 22 Jan 2013 05:40:02 +0000 (13:40 +0800)]
Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle

8 years agoMDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php
Damyon Wiese [Tue, 22 Jan 2013 05:34:01 +0000 (13:34 +0800)]
MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php

The failure was caused by a regression in MDL-37527.

8 years agoMerge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:58:27 +0000 (12:58 +0800)]
Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle

8 years agoMerge branch 'MDL-27164-master' of git://github.com/micaherne/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:51:51 +0000 (12:51 +0800)]
Merge branch 'MDL-27164-master' of git://github.com/micaherne/moodle

8 years agoMerge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:49:18 +0000 (12:49 +0800)]
Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-37275_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:46:09 +0000 (12:46 +0800)]
Merge branch 'MDL-37275_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-37375' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:43:47 +0000 (12:43 +0800)]
Merge branch 'MDL-37375' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:41:12 +0000 (12:41 +0800)]
Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:35:54 +0000 (12:35 +0800)]
Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 22 Jan 2013 04:10:48 +0000 (12:10 +0800)]
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle

Conflicts:
repository/wikimedia/wikimedia.php

8 years agoMerge branch 'MDL-37430-master' of github.com:damyon/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:53:10 +0000 (11:53 +0800)]
Merge branch 'MDL-37430-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-35357' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:48:04 +0000 (11:48 +0800)]
Merge branch 'MDL-35357' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-37599' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:40:04 +0000 (11:40 +0800)]
Merge branch 'MDL-37599' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37583' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Jan 2013 03:37:24 +0000 (11:37 +0800)]
Merge branch 'MDL-37583' of git://github.com/timhunt/moodle

8 years agoMDL-36621 calendar: fixed up conflict error
Sam Hemelryk [Tue, 22 Jan 2013 03:35:48 +0000 (16:35 +1300)]
MDL-36621 calendar: fixed up conflict error

8 years agoMerge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 22 Jan 2013 03:35:03 +0000 (16:35 +1300)]
Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle

Conflicts:
calendar/lib.php
lib/db/caches.php
version.php

8 years agoMerge branch 'MDL-37473' of git://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:14:19 +0000 (11:14 +0800)]
Merge branch 'MDL-37473' of git://github.com/srynot4sale/moodle

8 years agoMerge branch 'MDL-17812' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:11:53 +0000 (11:11 +0800)]
Merge branch 'MDL-17812' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37585' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Jan 2013 03:08:16 +0000 (11:08 +0800)]
Merge branch 'MDL-37585' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37540-master' of git://github.com/damyon/moodle
Aparup Banerjee [Tue, 22 Jan 2013 02:59:26 +0000 (10:59 +0800)]
Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-37543-master' of git://github.com/damyon/moodle
Aparup Banerjee [Tue, 22 Jan 2013 02:56:06 +0000 (10:56 +0800)]
Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle

8 years agoMDL-37541 Wikimedia allows to resize found images
Marina Glancy [Tue, 22 Jan 2013 01:39:58 +0000 (12:39 +1100)]
MDL-37541 Wikimedia allows to resize found images

8 years agoMDL-37541 Wikimedia returns more information about images
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images

8 years agoMerge branch 'MDL-37539-master' of github.com:damyon/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 01:10:47 +0000 (02:10 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 22 Jan 2013 01:05:46 +0000 (09:05 +0800)]
Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle

8 years agoMDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.
Damyon Wiese [Tue, 22 Jan 2013 01:04:13 +0000 (09:04 +0800)]
MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.

8 years agoMerge branch 'MDL-36104_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:11:48 +0000 (01:11 +0100)]
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-37539-master' of github.com:damyon/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:05:54 +0000 (01:05 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-28512' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:02:12 +0000 (01:02 +0100)]
Merge branch 'MDL-28512' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)]
Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-37563-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 21 Jan 2013 20:10:44 +0000 (09:10 +1300)]
Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)]
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37577' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:01:39 +0000 (20:01 +0100)]
Merge branch 'MDL-37577' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-35924_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)]
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-34050' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:18 +0000 (16:47 +0100)]
Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle

8 years agoMDL-37577 quiz overdue handling: optimise database query
Tim Hunt [Fri, 18 Jan 2013 16:43:48 +0000 (16:43 +0000)]
MDL-37577 quiz overdue handling: optimise database query

This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.

8 years agoMDL-37599 question import: add missing string.
Tim Hunt [Mon, 21 Jan 2013 12:07:47 +0000 (12:07 +0000)]
MDL-37599 question import: add missing string.

AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END

8 years agoMerge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 09:06:09 +0000 (17:06 +0800)]
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-37585 Make $DB->set_debug(true) show run time of each query.
Tim Hunt [Fri, 18 Jan 2013 16:46:16 +0000 (16:46 +0000)]
MDL-37585 Make $DB->set_debug(true) show run time of each query.

8 years agoMDL-37593 use https for editor script if required
Petr Škoda [Mon, 21 Jan 2013 08:40:15 +0000 (09:40 +0100)]
MDL-37593 use https for editor script if required

8 years agoMDL-35357 Lesson Module: fixed undefined property for $answerformat
Michael de Raadt [Mon, 21 Jan 2013 07:34:26 +0000 (15:34 +0800)]
MDL-35357 Lesson Module: fixed undefined property for $answerformat

8 years agoMerge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 21 Jan 2013 07:26:13 +0000 (15:26 +0800)]
Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37571' of git://github.com/tmuras/moodle
Aparup Banerjee [Mon, 21 Jan 2013 07:05:46 +0000 (15:05 +0800)]
Merge branch 'MDL-37571' of git://github.com/tmuras/moodle

8 years agoMDL-37375 Report: fixed blog post link from course activity report
Rossiani Wijaya [Mon, 21 Jan 2013 06:59:23 +0000 (14:59 +0800)]
MDL-37375 Report: fixed blog post link from course activity report

8 years agoMDL-37541 Wikimedia returns more information about images
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images

8 years agoMDL-36104 mod_assign: added hidden labels to the feedback input fields
Mark Nelson [Tue, 15 Jan 2013 09:03:00 +0000 (17:03 +0800)]
MDL-36104 mod_assign: added hidden labels to the feedback input fields

8 years agoMerge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 04:49:15 +0000 (12:49 +0800)]
Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 04:38:13 +0000 (12:38 +0800)]
Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-37352 core_grade:fixed some ajax display issues
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues

8 years agoMerge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)]
Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle

8 years agoMDL-37100 webservices: Define core_calendar_get_calendar_events() api
Ankit Agarwal [Mon, 17 Dec 2012 02:59:33 +0000 (10:59 +0800)]
MDL-37100 webservices: Define core_calendar_get_calendar_events() api

8 years agoMDL-37100 webservices: PHPunit tests for core_calendar_get_calendar_events()
Ankit Agarwal [Fri, 18 Jan 2013 02:50:51 +0000 (10:50 +0800)]
MDL-37100 webservices: PHPunit tests for core_calendar_get_calendar_events()

8 years agoMDL-37100 webservices: Implement core_calendar_get_calendar_events()
Ankit Agarwal [Thu, 13 Dec 2012 07:57:46 +0000 (15:57 +0800)]
MDL-37100 webservices: Implement core_calendar_get_calendar_events()

8 years agoMerge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:53:12 +0000 (10:53 +0800)]
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle

8 years agoMDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription
Rajesh Taneja [Tue, 15 Jan 2013 08:29:16 +0000 (16:29 +0800)]
MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription

8 years agoMDL-37432 Calendar: Added check for empty calendar url
Rajesh Taneja [Tue, 15 Jan 2013 03:48:29 +0000 (11:48 +0800)]
MDL-37432 Calendar: Added check for empty calendar url

8 years agoMerge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)]
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:15:16 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:07:43 +0000 (10:07 +0800)]
Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle

8 years agoMerge branch 'MDL-37527-master' of github.com:damyon/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:03:34 +0000 (10:03 +0800)]
Merge branch 'MDL-37527-master' of github.com:damyon/moodle

8 years agoMerge branch 'MDL-32652_master' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:59:35 +0000 (09:59 +0800)]
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle

8 years agoMerge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:04:57 +0000 (09:04 +0800)]
Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle

8 years agoMerge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)]
Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle

8 years agoMDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to...
Mary Evans [Sun, 20 Jan 2013 22:23:53 +0000 (22:23 +0000)]
MDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to generaltable class in twelve files as listed.

8 years agoMDL-37591 admin/mnet: replaced generalbox class with generaltable
Mary Evans [Sun, 20 Jan 2013 21:52:09 +0000 (21:52 +0000)]
MDL-37591 admin/mnet: replaced generalbox class with generaltable

8 years agoMerge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-35817' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)]
Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle

8 years agoMDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade...
Andrew Davis [Wed, 19 Dec 2012 01:46:16 +0000 (09:46 +0800)]
MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items

8 years agoMDL-37559 fix display of multiple roles of other users
Petr Škoda [Sat, 19 Jan 2013 15:50:38 +0000 (16:50 +0100)]
MDL-37559 fix display of multiple roles of other users

Credit goes to Tyron Delean, thanks.