moodle.git
9 years agoMerge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2
Sam Hemelryk [Tue, 3 Jul 2012 21:32:45 +0000 (09:32 +1200)]
Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2

9 years agoMerge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Tue, 3 Jul 2012 20:33:14 +0000 (08:33 +1200)]
Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle

9 years agoMerge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 3 Jul 2012 20:26:14 +0000 (08:26 +1200)]
Merge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-33749 follow redirects for URL downloader
Kevin Wiliarty [Tue, 19 Jun 2012 18:14:49 +0000 (14:14 -0400)]
MDL-33749 follow redirects for URL downloader

9 years agoMerge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 14:17:36 +0000 (16:17 +0200)]
Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 14:08:03 +0000 (16:08 +0200)]
Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle

9 years agoMDL-33426 Completion: Multilang activity names wrong in alt/title
sam marshall [Wed, 13 Jun 2012 15:45:42 +0000 (16:45 +0100)]
MDL-33426 Completion: Multilang activity names wrong in alt/title

9 years agoMDL-32787 user: rule required for custom profile fields applies to all users editing...
Rajesh Taneja [Tue, 15 May 2012 17:53:09 +0000 (21:53 +0400)]
MDL-32787 user: rule required for custom profile fields applies to all users editing own profile

9 years agoMerge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 3 Jul 2012 04:35:32 +0000 (16:35 +1200)]
Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 3 Jul 2012 04:29:57 +0000 (12:29 +0800)]
Merge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 3 Jul 2012 04:19:07 +0000 (12:19 +0800)]
Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/db/upgrade.php

9 years agoMerge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 3 Jul 2012 04:11:48 +0000 (12:11 +0800)]
Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)]
Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34008' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:47:15 +0000 (11:47 +0800)]
Merge branch 'MDL-34008' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:40:08 +0000 (11:40 +0800)]
Merge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle

9 years agoMerge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jul 2012 03:15:07 +0000 (15:15 +1200)]
Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-30883' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:01:39 +0000 (11:01 +0800)]
Merge branch 'MDL-30883' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 3 Jul 2012 02:57:41 +0000 (14:57 +1200)]
Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'w27_MDL-34123_m24_newpasslang' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 3 Jul 2012 02:39:12 +0000 (10:39 +0800)]
Merge branch 'w27_MDL-34123_m24_newpasslang' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-33837-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 3 Jul 2012 02:24:26 +0000 (10:24 +0800)]
Merge branch 'wip-MDL-33837-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 3 Jul 2012 02:14:31 +0000 (14:14 +1200)]
Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 3 Jul 2012 01:45:12 +0000 (09:45 +0800)]
Merge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-33828 Portfolio: prevent notices while exporting to portfolios
Frederic Massart [Tue, 26 Jun 2012 09:28:03 +0000 (17:28 +0800)]
MDL-33828 Portfolio: prevent notices while exporting to portfolios

9 years agoMDL-33757 gradebook: Adding support to sort userlist by email address
ISHIKAWA Takayuki [Thu, 14 Jun 2012 12:29:33 +0000 (21:29 +0900)]
MDL-33757 gradebook: Adding support to sort userlist by email address

9 years agoMerge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 00:15:57 +0000 (02:15 +0200)]
Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 23:58:48 +0000 (01:58 +0200)]
Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-33770' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)]
Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 2 Jul 2012 23:36:01 +0000 (11:36 +1200)]
Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 23:04:47 +0000 (01:04 +0200)]
Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:55:29 +0000 (10:55 +1200)]
Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle

9 years agoMerge branch 'MDL-9214' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:47:07 +0000 (10:47 +1200)]
Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-32286' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:41:17 +0000 (10:41 +1200)]
Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33990' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:36:57 +0000 (10:36 +1200)]
Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle

9 years agoMDL-34014 cssoptimiser: Fixed some aweful spelling
Sam Hemelryk [Mon, 2 Jul 2012 22:34:13 +0000 (10:34 +1200)]
MDL-34014 cssoptimiser: Fixed some aweful spelling

9 years agoMerge branch 'MDL-34014' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:32:37 +0000 (10:32 +1200)]
Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-34022' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:30:30 +0000 (10:30 +1200)]
Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-34033' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:27:16 +0000 (10:27 +1200)]
Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Mon, 2 Jul 2012 22:20:56 +0000 (10:20 +1200)]
Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'MDL-28151' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:13:12 +0000 (10:13 +1200)]
Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-23813' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 21:50:39 +0000 (23:50 +0200)]
Merge branch 'MDL-23813' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-23254' of git://github.com/nebgor/moodle
Sam Hemelryk [Mon, 2 Jul 2012 21:42:08 +0000 (09:42 +1200)]
Merge branch 'MDL-23254' of git://github.com/nebgor/moodle

9 years agoMerge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 19:05:08 +0000 (21:05 +0200)]
Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle

9 years agoMDL-23813 glossary filter: add missing YUI dependency
Tim Hunt [Thu, 21 Jun 2012 21:03:09 +0000 (22:03 +0100)]
MDL-23813 glossary filter: add missing YUI dependency

Fix found by Huy Hoang. I am just making a commit.

9 years agoMDL-34121 bump versions to efectively get the upgrade performed.
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 16:15:47 +0000 (18:15 +0200)]
MDL-34121 bump versions to efectively get the upgrade performed.

9 years agoMerge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 16:12:57 +0000 (18:12 +0200)]
Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 2 Jul 2012 09:44:01 +0000 (17:44 +0800)]
Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-33916-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 2 Jul 2012 09:35:46 +0000 (17:35 +0800)]
Merge branch 'MDL-33916-master-2' of git://git.luns.net.uk/moodle

9 years agoMDL-31802 - navigation: add a comment about session reduction
Dan Poltawski [Mon, 2 Jul 2012 09:29:30 +0000 (17:29 +0800)]
MDL-31802 - navigation: add a comment about session reduction

9 years agoMerge branch 'MDL-31802' of git://github.com/aolley/moodle
Dan Poltawski [Mon, 2 Jul 2012 09:24:48 +0000 (17:24 +0800)]
Merge branch 'MDL-31802' of git://github.com/aolley/moodle

9 years agoMerge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 2 Jul 2012 09:09:44 +0000 (17:09 +0800)]
Merge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'w27_MDL-34120_m24_delpass' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:48:22 +0000 (16:48 +0800)]
Merge branch 'w27_MDL-34120_m24_delpass' of git://github.com/skodak/moodle

9 years agoMerge branch 'w27_MDL-34125_m24_tablename' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:46:21 +0000 (16:46 +0800)]
Merge branch 'w27_MDL-34125_m24_tablename' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-34109' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:42:56 +0000 (16:42 +0800)]
Merge branch 'MDL-34109' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w27_MDL-34045_m24_idnumber' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:34:11 +0000 (16:34 +0800)]
Merge branch 'w27_MDL-34045_m24_idnumber' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-34025_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:28:05 +0000 (16:28 +0800)]
Merge branch 'MDL-34025_master' of https://github.com/markn86/moodle

9 years agoMerge branch 'MDL-33924' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:19:14 +0000 (16:19 +0800)]
Merge branch 'MDL-33924' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-33914' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:14:07 +0000 (16:14 +0800)]
Merge branch 'master_MDL-33914' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-33835' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:09:59 +0000 (16:09 +0800)]
Merge branch 'master_MDL-33835' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-33780' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:07:13 +0000 (16:07 +0800)]
Merge branch 'MDL-33780' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-MDL-33721-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 2 Jul 2012 08:00:06 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-33721-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle
Dan Poltawski [Mon, 2 Jul 2012 07:50:09 +0000 (15:50 +0800)]
Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle

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

9 years agoMerge branch 'MDL-25476_email_from_support' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 2 Jul 2012 07:41:16 +0000 (15:41 +0800)]
Merge branch 'MDL-25476_email_from_support' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-9073-master' of github.com:FMCorz/moodle
Dan Poltawski [Mon, 2 Jul 2012 07:33:31 +0000 (15:33 +0800)]
Merge branch 'MDL-9073-master' of github.com:FMCorz/moodle

9 years agoMerge branch 'master_MDL-31203_advanced_forum_search_always_reverts_date_from_and_to...
Dan Poltawski [Mon, 2 Jul 2012 07:23:52 +0000 (15:23 +0800)]
Merge branch 'master_MDL-31203_advanced_forum_search_always_reverts_date_from_and_to' of git://github.com/kanikagoyal/moodle

9 years agoMerge branch 'MDL-26465' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 2 Jul 2012 07:18:26 +0000 (15:18 +0800)]
Merge branch 'MDL-26465' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 2 Jul 2012 07:12:39 +0000 (15:12 +0800)]
Merge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle

9 years agoMDL-34019 Fix response item key name
David Mudrák [Tue, 26 Jun 2012 07:12:35 +0000 (09:12 +0200)]
MDL-34019 Fix response item key name

9 years agoMerge branch 'MDL-34054' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Jul 2012 06:56:50 +0000 (14:56 +0800)]
Merge branch 'MDL-34054' of git://github.com/timhunt/moodle

9 years agoMDL-33995 - unit tests: fix class name collision
Dan Poltawski [Mon, 2 Jul 2012 06:52:57 +0000 (14:52 +0800)]
MDL-33995 - unit tests: fix class name collision

9 years agoMDL-31987 Assignment module: fixed upgrade version
Rossiani Wijaya [Mon, 2 Jul 2012 06:46:43 +0000 (14:46 +0800)]
MDL-31987 Assignment module: fixed upgrade version

9 years agoMDL-31987 Assignment module: fix sql for postgres.
Dan Poltawski [Mon, 2 Jul 2012 06:45:46 +0000 (14:45 +0800)]
MDL-31987 Assignment module: fix sql for postgres.

9 years agoMDL-31987 Assignment module: Assignment count submissions correctly.
Rossiani Wijaya [Thu, 28 Jun 2012 02:47:42 +0000 (10:47 +0800)]
MDL-31987 Assignment module: Assignment count submissions correctly.
For advanced upload assignment, store file count of each submission
into assignment_submissions.numfiles

When counting submissions, if the assignment is open and tracking
drafts, only submissions which has send for marking are counted.
Otherwise, submissions which has numfiles > 0 are counted.

Also change a hardcoded 'submitted' to ASSIGNMENT_STATUS_SUBMITTED.

This patch was originally written by: Sunner Sun <sunner@gmail.com>.

I made some modifation to fixed count_real_submissions() query (ref: MDL-32207) in /mod/assignment/type/upload/assignment.class.php file

9 years agoMerge branch 'MDL-33776' of git://github.com/mouneyrac/moodle
Dan Poltawski [Mon, 2 Jul 2012 06:12:53 +0000 (14:12 +0800)]
Merge branch 'MDL-33776' of git://github.com/mouneyrac/moodle

9 years agoMDL-34117 Correctly pass accepted_types to dnduploader
Marina Glancy [Mon, 2 Jul 2012 06:06:45 +0000 (14:06 +0800)]
MDL-34117 Correctly pass accepted_types to dnduploader

9 years agoMDL-33948 mod_forum correctly passes files options to file_save_draft_area_files()
Marina Glancy [Tue, 26 Jun 2012 03:25:57 +0000 (11:25 +0800)]
MDL-33948 mod_forum correctly passes files options to file_save_draft_area_files()

9 years agoMDL-33948 file_save_draft_area_files() validates if references are allowed and allows...
Marina Glancy [Tue, 26 Jun 2012 03:40:08 +0000 (11:40 +0800)]
MDL-33948 file_save_draft_area_files() validates if references are allowed and allows unlimited file size

9 years agoMDL-33837 picking file from server files should not copy 'Main file' property
Marina Glancy [Wed, 27 Jun 2012 02:49:34 +0000 (10:49 +0800)]
MDL-33837 picking file from server files should not copy 'Main file' property

9 years agoMDL-33721 show loading icon after file has been selected in filepicker, prevent click...
Marina Glancy [Tue, 26 Jun 2012 06:36:10 +0000 (14:36 +0800)]
MDL-33721 show loading icon after file has been selected in filepicker, prevent clicking select button twice

9 years agoMerge branch 'MDL-33995' of git://github.com/mouneyrac/moodle
Dan Poltawski [Mon, 2 Jul 2012 06:09:13 +0000 (14:09 +0800)]
Merge branch 'MDL-33995' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'master_MDL-33978' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jul 2012 05:44:10 +0000 (13:44 +0800)]
Merge branch 'master_MDL-33978' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 2 Jul 2012 02:53:31 +0000 (14:53 +1200)]
Merge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-33932_master' of git://github.com/grabs/moodle
Sam Hemelryk [Mon, 2 Jul 2012 02:31:55 +0000 (14:31 +1200)]
Merge branch 'MDL-33932_master' of git://github.com/grabs/moodle

9 years agoMerge branch 'MDL-33627_master' of git://github.com/grabs/moodle
Sam Hemelryk [Mon, 2 Jul 2012 02:06:14 +0000 (14:06 +1200)]
Merge branch 'MDL-33627_master' of git://github.com/grabs/moodle

9 years agoMDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files
Sam Hemelryk [Thu, 31 May 2012 02:51:02 +0000 (14:51 +1200)]
MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files

9 years agoMDL-33303 Filepicker: resized to match HTML editor and made resizable
Frederic Massart [Fri, 8 Jun 2012 01:59:59 +0000 (09:59 +0800)]
MDL-33303 Filepicker: resized to match HTML editor and made resizable

9 years agoweekly release 2.4dev
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 22:55:18 +0000 (00:55 +0200)]
weekly release 2.4dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 22:39:51 +0000 (00:39 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 22:30:46 +0000 (00:30 +0200)]
Merge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-34044' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Sun, 1 Jul 2012 20:22:45 +0000 (08:22 +1200)]
Merge branch 'MDL-34044' of git://github.com/srynot4sale/moodle

9 years agoMerge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 19:58:59 +0000 (21:58 +0200)]
Merge branch 'w27_MDL-34130_m24_recordsettests' of git://github.com/skodak/moodle

9 years agoMDL-34130 prevent some warning in PHPStorm
Petr Škoda [Sun, 1 Jul 2012 19:50:36 +0000 (21:50 +0200)]
MDL-34130 prevent some warning in PHPStorm

9 years agoMDL-34130 test recordset data is static
Petr Škoda [Sun, 1 Jul 2012 19:35:37 +0000 (21:35 +0200)]
MDL-34130 test recordset data is static

We do not want recordset results to be affected by subsequent update or delete queries.

9 years agoMDL-34130 add missing rs close
Petr Škoda [Sun, 1 Jul 2012 19:00:16 +0000 (21:00 +0200)]
MDL-34130 add missing rs close

Thanks Eloy!

9 years agoMDL-34130 test interaction of recordsets and transactions
Petr Škoda [Sun, 1 Jul 2012 11:43:55 +0000 (13:43 +0200)]
MDL-34130 test interaction of recordsets and transactions

9 years agoMDL-34130 test nested recordset iteration
Petr Škoda [Sun, 1 Jul 2012 11:34:22 +0000 (13:34 +0200)]
MDL-34130 test nested recordset iteration

9 years agoMDL-34130 fix data inserts in recordset tests
Petr Škoda [Sun, 1 Jul 2012 11:30:59 +0000 (13:30 +0200)]
MDL-34130 fix data inserts in recordset tests

9 years agoMDL-34125 fix regression when deleting activity modules
Petr Škoda [Sun, 1 Jul 2012 08:04:54 +0000 (10:04 +0200)]
MDL-34125 fix regression when deleting activity modules

Credit goes to Gordon Bateson.

9 years agoAutomatically generated installer lang files
AMOS bot [Sun, 1 Jul 2012 00:31:36 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-32249c' of github.com:srynot4sale/moodle
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 00:02:56 +0000 (02:02 +0200)]
Merge branch 'MDL-32249c' of github.com:srynot4sale/moodle