moodle.git
9 years agoMDL-30981 upgrade: Fixed a couple of phpdoc typos
Sam Hemelryk [Mon, 2 Apr 2012 00:27:23 +0000 (12:27 +1200)]
MDL-30981 upgrade: Fixed a couple of phpdoc typos

9 years agoMerge branch 'MDL-30981' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 2 Apr 2012 00:26:41 +0000 (12:26 +1200)]
Merge branch 'MDL-30981' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 1 Apr 2012 23:28:09 +0000 (11:28 +1200)]
Merge branch 'MDL-32256-cron-return' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 1 Apr 2012 23:24:54 +0000 (11:24 +1200)]
Merge branch 'MDL-32258-data-cron' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content...
Sam Hemelryk [Sun, 1 Apr 2012 23:19:58 +0000 (11:19 +1200)]
Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content' of git://github.com/kanikagoyal/moodle

9 years agoMDL-30981 Upgrade API: Added related phpdocs
Eloy Lafuente (stronk7) [Sun, 1 Apr 2012 20:48:17 +0000 (22:48 +0200)]
MDL-30981 Upgrade API: Added related phpdocs

9 years agoMerge branch 'MDL-31711' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)]
Merge branch 'MDL-31711' of git://github.com/nebgor/moodle

9 years agoMerge branch 'MDL-32289' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 1 Apr 2012 22:16:52 +0000 (10:16 +1200)]
Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle

9 years agoMDL-32289 theme_afterburner: added lang menu to frontpage layout in config.php
Mary Evans [Sun, 1 Apr 2012 00:05:14 +0000 (01:05 +0100)]
MDL-32289 theme_afterburner: added lang menu to frontpage layout in config.php

9 years agoMDL-32262 theme_afterburner: fixed missing comma in afterburner_styles.css
Mary Evans [Sat, 31 Mar 2012 23:31:23 +0000 (00:31 +0100)]
MDL-32262 theme_afterburner: fixed missing comma in afterburner_styles.css

9 years agoMDL-32258 database module does not have any data_cron() function to execute
David Mudrak [Thu, 29 Mar 2012 13:59:45 +0000 (15:59 +0200)]
MDL-32258 database module does not have any data_cron() function to execute

9 years agoMDL-32256 quiz_cron() now returns true as expected by the current API
David Mudrak [Thu, 29 Mar 2012 13:45:45 +0000 (15:45 +0200)]
MDL-32256 quiz_cron() now returns true as expected by the current API

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:25:53 +0000 (13:25 +0200)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:19:59 +0000 (13:19 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoRevert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"
Dan Poltawski [Thu, 29 Mar 2012 08:05:47 +0000 (16:05 +0800)]
Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"

This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.

Conflicts:

lib/db/upgrade.php
version.php

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 29 Mar 2012 00:31:42 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 28 Mar 2012 20:49:38 +0000 (22:49 +0200)]
Merge branch 'w13_MDL-32095_m23_strict2' of git://github.com/skodak/moodle

9 years agoMDL-32095 last E_STRICT fix for now
Petr Skoda [Wed, 28 Mar 2012 20:48:18 +0000 (22:48 +0200)]
MDL-32095 last E_STRICT fix for now

9 years agoMDL-32095 fix outputlib test to setup debug level properly
Petr Skoda [Wed, 28 Mar 2012 20:47:57 +0000 (22:47 +0200)]
MDL-32095 fix outputlib test to setup debug level properly

9 years agoMDL-12730 new debug levels (support strict) + upgrade from old ones
Petr Skoda [Wed, 28 Mar 2012 14:39:42 +0000 (16:39 +0200)]
MDL-12730 new debug levels (support strict) + upgrade from old ones

9 years agoMDL-31775 lesson: fix undefined variable warnings
Dan Poltawski [Tue, 27 Mar 2012 12:01:06 +0000 (20:01 +0800)]
MDL-31775 lesson: fix undefined variable warnings

9 years agoMerge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 27 Mar 2012 08:10:17 +0000 (10:10 +0200)]
Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle

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

9 years agoMDL-31711 Documentation : changed usages of @property to @var for non-magic variables.
Aparup Banerjee [Tue, 27 Mar 2012 08:01:14 +0000 (16:01 +0800)]
MDL-31711 Documentation : changed usages of @property to @var for non-magic variables.

9 years agoMerge branch 'MDL-32028' of git://github.com/nebgor/moodle
Dan Poltawski [Tue, 27 Mar 2012 06:46:52 +0000 (14:46 +0800)]
Merge branch 'MDL-32028' of git://github.com/nebgor/moodle

9 years agoMerge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 27 Mar 2012 05:22:01 +0000 (13:22 +0800)]
Merge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-30235' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 27 Mar 2012 04:37:08 +0000 (12:37 +0800)]
Merge branch 'MDL-30235' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 27 Mar 2012 02:15:18 +0000 (10:15 +0800)]
Merge branch 'w13_MDL-32109_m23_fastpurify' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 27 Mar 2012 02:10:05 +0000 (10:10 +0800)]
Merge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 27 Mar 2012 01:58:44 +0000 (09:58 +0800)]
Merge branch 'MDL-31869_message_search_roles' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 26 Mar 2012 22:03:19 +0000 (11:03 +1300)]
Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 26 Mar 2012 21:05:43 +0000 (10:05 +1300)]
Merge branch 'MDL-11378-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 26 Mar 2012 20:51:40 +0000 (09:51 +1300)]
Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-32202' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 19:36:08 +0000 (21:36 +0200)]
Merge branch 'MDL-32202' of git://github.com/stronk7/moodle

9 years agoMDL-32202 scorm: fix 2 invalid default="null" definitions
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 19:27:47 +0000 (21:27 +0200)]
MDL-32202 scorm: fix 2 invalid default="null" definitions

Note the whole file has been changed because its previous
(manual!) commit leaded to incorrect indentation, but really
only 2 definitions have been changed:

scorm->completionstatusrequired
scorm->completionscorerequired

9 years agoMDL-32112 mysql: change rename sql generator to pass validation
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 17:57:58 +0000 (19:57 +0200)]
MDL-32112 mysql: change rename sql generator to pass validation

9 years agoMerge branch 'w13_MDL-32112_m23_dbman' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 17:40:58 +0000 (19:40 +0200)]
Merge branch 'w13_MDL-32112_m23_dbman' of git://github.com/skodak/moodle

9 years agoMDL-32095 fix event handler classes to be E_STRICT compatible
Petr Skoda [Mon, 26 Mar 2012 14:04:47 +0000 (16:04 +0200)]
MDL-32095 fix event handler classes to be E_STRICT compatible

9 years agoMDL-32095 fix backup API to be E_STRICT compatible
Petr Skoda [Mon, 26 Mar 2012 13:57:57 +0000 (15:57 +0200)]
MDL-32095 fix backup API to be E_STRICT compatible

9 years agoMDL-32095 fix backup API to be E_STRICT
Petr Skoda [Mon, 26 Mar 2012 13:30:04 +0000 (15:30 +0200)]
MDL-32095 fix backup API to be E_STRICT

9 years agoMDL-32095 some more E_STRICT fixes
Petr Skoda [Mon, 26 Mar 2012 09:47:15 +0000 (11:47 +0200)]
MDL-32095 some more E_STRICT fixes

9 years agoMerge branch 'MDL-31775' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 26 Mar 2012 06:39:10 +0000 (14:39 +0800)]
Merge branch 'MDL-31775' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-32172' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 26 Mar 2012 04:23:15 +0000 (12:23 +0800)]
Merge branch 'MDL-32172' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git...
Dan Poltawski [Mon, 26 Mar 2012 04:09:32 +0000 (12:09 +0800)]
Merge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git://github.com/kanikagoyal/moodle

9 years agoMerge branch 'MDL-27710' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 26 Mar 2012 03:28:21 +0000 (11:28 +0800)]
Merge branch 'MDL-27710' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 26 Mar 2012 02:51:38 +0000 (10:51 +0800)]
Merge branch 'master_MDL-32080' of git://github.com/danmarsden/moodle

9 years agoMDL-32106: fixed JS bug - when html element did not exist the script stopped
Marina Glancy [Tue, 20 Mar 2012 00:56:31 +0000 (08:56 +0800)]
MDL-32106: fixed JS bug - when html element did not exist the script stopped

9 years agoMerge branch 'MDL-32176' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 26 Mar 2012 01:35:49 +0000 (09:35 +0800)]
Merge branch 'MDL-32176' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32177' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 26 Mar 2012 01:26:21 +0000 (09:26 +0800)]
Merge branch 'MDL-32177' of git://github.com/timhunt/moodle

9 years agoMDL-31513 rename 'Edit service' to 'Save changes'
Iurii Kucherov [Thu, 22 Mar 2012 19:08:24 +0000 (21:08 +0200)]
MDL-31513 rename 'Edit service' to 'Save changes'

9 years agoMerge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 25 Mar 2012 23:01:29 +0000 (12:01 +1300)]
Merge branch 'MDL-32142-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Sun, 25 Mar 2012 22:57:39 +0000 (11:57 +1300)]
Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-31903 course: Title on highlight and hide icon should be only added in ie
Rajesh Taneja [Fri, 16 Mar 2012 07:05:27 +0000 (15:05 +0800)]
MDL-31903 course: Title on highlight and hide icon should be only added in ie

9 years agoMDL-31903 course: Highlight icon will get iniatlised properly
Rajesh Taneja [Fri, 16 Mar 2012 06:54:21 +0000 (14:54 +0800)]
MDL-31903 course: Highlight icon will get iniatlised properly

9 years agoMDL-31903 course: update patch to fix course highlight icon and title toggle
Rajesh Taneja [Thu, 15 Mar 2012 07:19:36 +0000 (15:19 +0800)]
MDL-31903 course: update patch to fix course highlight icon and title toggle

9 years agoMDL-31903 course: Fixed course highlight icon and title toggle
Juho Viitasalo [Tue, 6 Mar 2012 07:42:12 +0000 (09:42 +0200)]
MDL-31903 course: Fixed course highlight icon and title toggle

9 years agoMDL-29400 assignment: Require a file to be uploaded in form
Dan Poltawski [Mon, 19 Mar 2012 03:41:39 +0000 (11:41 +0800)]
MDL-29400 assignment: Require a file to be uploaded in form

Don't display 'File uploaded successfully' when no file uploaded for
both upload and uploadsingle

9 years agoMerge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 25 Mar 2012 22:13:54 +0000 (11:13 +1300)]
Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32027-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 25 Mar 2012 22:06:34 +0000 (11:06 +1300)]
Merge branch 'MDL-32027-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 25 Mar 2012 21:35:48 +0000 (10:35 +1300)]
Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle

9 years agoMerge branch 'w13_MDL-32029_m23_extdb' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 25 Mar 2012 21:31:36 +0000 (10:31 +1300)]
Merge branch 'w13_MDL-32029_m23_extdb' of git://github.com/skodak/moodle

9 years agoMDL-31908 Glossary: entry list format- printable version does not show content
Kanika Goyal [Sun, 25 Mar 2012 18:30:24 +0000 (00:00 +0530)]
MDL-31908 Glossary: entry list format- printable version does not show content

9 years agoMDL-30019 theme_fusion: fix for mod-assignment-submission page by reducing font-size...
Mary Evans [Sun, 25 Mar 2012 07:16:11 +0000 (08:16 +0100)]
MDL-30019 theme_fusion: fix for mod-assignment-submission page by reducing font-size and page wapper padding

9 years agoMDL-32112 use constants for field and table limits
Petr Skoda [Tue, 20 Mar 2012 18:30:45 +0000 (19:30 +0100)]
MDL-32112 use constants for field and table limits

For now using the same JS hardcoding trick Eloy did the last time...

9 years agoMDL-32112 horrible hack that ignores invalid size for XMLDB_TYPE_NUMBER in numerical...
Petr Skoda [Mon, 19 Mar 2012 19:48:48 +0000 (20:48 +0100)]
MDL-32112 horrible hack that ignores invalid size for XMLDB_TYPE_NUMBER in numerical question type

The easies fix could be to use VARCHAR instead because this field is used only for reading and writing, no selects on this field it seems.

9 years agoMDL-32112 validate float definition in sql_generator
Petr Skoda [Mon, 19 Mar 2012 19:10:01 +0000 (20:10 +0100)]
MDL-32112 validate float definition in sql_generator

9 years agoMDL-32112 validate number definition in sql_generator
Petr Skoda [Mon, 19 Mar 2012 19:00:33 +0000 (20:00 +0100)]
MDL-32112 validate number definition in sql_generator

9 years agoMDL-32112 validate integer definition in sql_generator
Petr Skoda [Mon, 19 Mar 2012 18:49:28 +0000 (19:49 +0100)]
MDL-32112 validate integer definition in sql_generator

9 years agoMDL-32112 validate table name restrictions in sql_generator
Petr Skoda [Mon, 19 Mar 2012 18:00:09 +0000 (19:00 +0100)]
MDL-32112 validate table name restrictions in sql_generator

9 years agoMDL-32112 validate field name restrictions in sql_generator
Petr Skoda [Mon, 19 Mar 2012 17:44:33 +0000 (18:44 +0100)]
MDL-32112 validate field name restrictions in sql_generator

9 years agoMDL-31685 new setting for prevention of file based locking
Petr Skoda [Sun, 18 Mar 2012 20:13:31 +0000 (21:13 +0100)]
MDL-31685 new setting for prevention of file based locking

Please note that this setting can not be stored in database because some scripts use ABORT_AFTER_CONFIG.

9 years agoMDL-32029 fix get_tables() when prefix empty in external database
Petr Skoda [Sun, 18 Mar 2012 19:50:24 +0000 (20:50 +0100)]
MDL-32029 fix get_tables() when prefix empty in external database

9 years agoMDL-32109 migrate tests to PHPUnit
Petr Skoda [Sat, 24 Mar 2012 10:33:59 +0000 (11:33 +0100)]
MDL-32109 migrate tests to PHPUnit

9 years agoMDL-32109 do not use HTMLPurifier for some safe and valid html fragments
Petr Skoda [Mon, 19 Mar 2012 13:02:28 +0000 (14:02 +0100)]
MDL-32109 do not use HTMLPurifier for some safe and valid html fragments

9 years agoMDL-32177 questions: allow default questiontext in the editing form.
Tim Hunt [Mon, 5 Mar 2012 18:22:02 +0000 (18:22 +0000)]
MDL-32177 questions: allow default questiontext in the editing form.

9 years agoMDL-32176 formslib: allow {no} in repeat_element default values.
Tim Hunt [Mon, 5 Mar 2012 18:22:33 +0000 (18:22 +0000)]
MDL-32176 formslib: allow {no} in repeat_element default values.

9 years agoMDL-32172 Lesson Module: add variable initialization for
Rossiani Wijaya [Fri, 23 Mar 2012 07:36:39 +0000 (15:36 +0800)]
MDL-32172 Lesson Module: add variable initialization for

9 years agoMDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in
Ankit Agarwal [Fri, 23 Mar 2012 06:40:35 +0000 (14:40 +0800)]
MDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in
require_login

9 years agoMDL-29331 Users: Participants list with user_details now show check box for bluk...
Rajesh Taneja [Tue, 20 Mar 2012 03:03:33 +0000 (11:03 +0800)]
MDL-29331 Users: Participants list with user_details now show check box for bluk operation

9 years agoMDL-31856 Choice: if choice not open, responses inconsistently displayed
Kanika Goyal [Fri, 23 Mar 2012 03:26:13 +0000 (08:56 +0530)]
MDL-31856 Choice: if choice not open, responses inconsistently displayed

9 years agoMDL-27710 lesson module: add the following jump options: unseen branch page, random...
Rossiani Wijaya [Tue, 20 Mar 2012 07:17:38 +0000 (15:17 +0800)]
MDL-27710 lesson module: add the following jump options: unseen branch page, random page and random branch

9 years agoMDL-31654 users: Added check for custom profile fields, if wrong data is passed then...
Rajesh Taneja [Tue, 13 Mar 2012 03:13:30 +0000 (11:13 +0800)]
MDL-31654 users: Added check for custom profile fields, if wrong data is passed then user will not be able to proceed

9 years agoMDL-31654 users: removed hardcoding and added docblock on top of tim's patch
Rajesh Taneja [Thu, 1 Mar 2012 03:27:24 +0000 (11:27 +0800)]
MDL-31654 users: removed hardcoding and added docblock on top of tim's patch

9 years agoMDL-31654 users: custom profile menu fields will convert values to keys, so it can...
tim@netspot.com.au [Thu, 1 Mar 2012 02:05:46 +0000 (10:05 +0800)]
MDL-31654 users: custom profile menu fields will convert values to keys, so it can be processed

9 years agoweekly release 2.3dev
Sam Hemelryk [Thu, 22 Mar 2012 23:19:47 +0000 (12:19 +1300)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Sam Hemelryk [Thu, 22 Mar 2012 23:11:57 +0000 (12:11 +1300)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-32147 - use correct 404 for server type
Dan Marsden [Thu, 22 Mar 2012 20:58:52 +0000 (09:58 +1300)]
MDL-32147 - use correct 404 for server type

9 years agoMDL-11378 Add SMTP security protocol setting to email configuration
Ruslan Kabalin [Tue, 13 Mar 2012 14:13:06 +0000 (14:13 +0000)]
MDL-11378 Add SMTP security protocol setting to email configuration

9 years agoMDL-32026 messaging: Fix non-existing variable in the error output
Ruslan Kabalin [Fri, 9 Mar 2012 16:32:39 +0000 (16:32 +0000)]
MDL-32026 messaging: Fix non-existing variable in the error output

9 years agoMDL-32142 Add missing langstring for section backups
Andrew Robert Nicols [Thu, 22 Mar 2012 14:52:28 +0000 (14:52 +0000)]
MDL-32142 Add missing langstring for section backups

9 years agoMDL-30482 - Glossary - Fixing the capability controls for the recent activity block
Jason Fowler [Thu, 22 Mar 2012 07:27:48 +0000 (15:27 +0800)]
MDL-30482 - Glossary - Fixing the capability controls for the recent activity block

9 years agoMDL-32147 SCORM improve performance of 404s for files inside SCORM packages.
Dan Marsden [Thu, 22 Mar 2012 07:05:59 +0000 (20:05 +1300)]
MDL-32147 SCORM improve performance of 404s for files inside SCORM packages.

9 years agoRevert "MDL-17327 - data - improved the sql query for very large advanced searches"
Aparup Banerjee [Thu, 22 Mar 2012 01:21:25 +0000 (09:21 +0800)]
Revert "MDL-17327 - data - improved the sql query for very large advanced searches"

This reverts commit 72d4340a0e0acd69a0ba91dc262ea57e86a52117.

Testing cross db compatibility failed.

9 years agoMDL-31857 phpunit: PHPDoc and typo fixes during integration
Sam Hemelryk [Wed, 21 Mar 2012 21:45:17 +0000 (10:45 +1300)]
MDL-31857 phpunit: PHPDoc and typo fixes during integration

9 years agoMerge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle
Sam Hemelryk [Wed, 21 Mar 2012 21:44:04 +0000 (10:44 +1300)]
Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle

9 years agoMDL-31528 categories: Fixed up typo
Sam Hemelryk [Wed, 21 Mar 2012 20:45:45 +0000 (09:45 +1300)]
MDL-31528 categories: Fixed up typo

9 years agoMDL-31857basic phpunit support
Petr Skoda [Wed, 21 Mar 2012 09:31:37 +0000 (10:31 +0100)]
MDL-31857basic phpunit support

Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.

9 years agoMerge branch 'wip-MDL-27236-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 21 Mar 2012 06:51:40 +0000 (14:51 +0800)]
Merge branch 'wip-MDL-27236-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-27236: Server files, improve tree view
Marina Glancy [Wed, 21 Mar 2012 05:55:22 +0000 (13:55 +0800)]
MDL-27236: Server files, improve tree view

- Removed 'Private files' from 'Server files' repository;
- Show only non-empty directories (taking into account filetype filter);
- If there is only one non-empty filearea within a module, do not show it and skip the extra subdirectory level;
- If the user is not admin (does not have 'moodle/course:update' capability in system context), do not show course categories, just list available courses;
- Also when retrieving the course files capability to managefiles is checked before retrieving the modules list for performance tuning on sites with a lot of courses

9 years agoMerge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 21 Mar 2012 03:38:09 +0000 (11:38 +0800)]
Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle

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

9 years agoMerge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master
Aparup Banerjee [Wed, 21 Mar 2012 02:50:51 +0000 (10:50 +0800)]
Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master
 - resolved conflicts
 - fixed up tab --> spaces