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

9 years agoMDL-30482 - Glossary - Adding capability to other areas using glossary
Jason Fowler [Thu, 1 Dec 2011 05:47:59 +0000 (13:47 +0800)]
MDL-30482 - Glossary - Adding capability to other areas using glossary

9 years agoMerge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle
Aparup Banerjee [Wed, 21 Mar 2012 02:02:18 +0000 (10:02 +0800)]
Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle

9 years agoMDL-17327 - data - improved the sql query for very large advanced searches
adrian@moodle.com [Tue, 13 Dec 2011 02:45:48 +0000 (10:45 +0800)]
MDL-17327 - data - improved the sql query for very large advanced searches

9 years agoMDL-29515 lib/upgrade.txt: add a note about removed methods
Dan Poltawski [Wed, 21 Mar 2012 01:28:02 +0000 (09:28 +0800)]
MDL-29515 lib/upgrade.txt: add a note about removed methods

9 years agoMerge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 21 Mar 2012 01:25:47 +0000 (09:25 +0800)]
Merge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle

9 years agoMDL-31640 course search: Coding style clean up
Sam Hemelryk [Tue, 20 Mar 2012 20:49:38 +0000 (09:49 +1300)]
MDL-31640 course search: Coding style clean up

9 years agoMDL-27469 scorm: Add extra activity completion conditions
Aaron Barnes [Fri, 10 Jun 2011 01:26:15 +0000 (13:26 +1200)]
MDL-27469 scorm: Add extra activity completion conditions

9 years agoMerge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 20 Mar 2012 20:41:32 +0000 (09:41 +1300)]
Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 20 Mar 2012 20:29:24 +0000 (09:29 +1300)]
Merge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 20 Mar 2012 20:24:58 +0000 (09:24 +1300)]
Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 20 Mar 2012 20:20:29 +0000 (09:20 +1300)]
Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle

9 years agoMDL-31266 Lesson module: Improve feedback so that the responses are concatenated...
Rossiani Wijaya [Tue, 13 Mar 2012 06:54:39 +0000 (14:54 +0800)]
MDL-31266 Lesson module: Improve feedback so that the responses are concatenated instead of overwritten

9 years agoMerge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 20 Mar 2012 08:40:28 +0000 (16:40 +0800)]
Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle

9 years agoMDL-32094 fix duration test
Petr Skoda [Tue, 20 Mar 2012 08:22:29 +0000 (09:22 +0100)]
MDL-32094 fix duration test

9 years agoMDL-29848 glossary: fixed whitespace
Aparup Banerjee [Tue, 20 Mar 2012 08:12:02 +0000 (16:12 +0800)]
MDL-29848 glossary: fixed whitespace

9 years agoMerge branch 'MDL-29848-master' of https://github.com/mackensen/moodle
Aparup Banerjee [Tue, 20 Mar 2012 08:06:40 +0000 (16:06 +0800)]
Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-31818_grader_paging' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 20 Mar 2012 05:20:03 +0000 (13:20 +0800)]
Merge branch 'MDL-31818_grader_paging' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 20 Mar 2012 03:47:17 +0000 (16:47 +1300)]
Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle

9 years agoMDL-11047 mod_quiz: bumped version in upgrade after conflict resolution
Sam Hemelryk [Tue, 20 Mar 2012 03:46:19 +0000 (16:46 +1300)]
MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution

9 years agoMDL-28592 blocks: changing the arguments to moodle_url::out()
Ankit Agarwal [Tue, 20 Mar 2012 02:57:12 +0000 (10:57 +0800)]
MDL-28592 blocks: changing the arguments to moodle_url::out()

9 years agoMerge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 20 Mar 2012 02:09:43 +0000 (10:09 +0800)]
Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'MDL-11047' of git://github.com/mackensen/moodle
Sam Hemelryk [Tue, 20 Mar 2012 01:04:04 +0000 (14:04 +1300)]
Merge branch 'MDL-11047' of git://github.com/mackensen/moodle

Conflicts:
mod/quiz/version.php

9 years agoMerge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 20 Mar 2012 00:33:30 +0000 (13:33 +1300)]
Merge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 23:50:21 +0000 (12:50 +1300)]
Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 23:12:44 +0000 (12:12 +1300)]
Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 23:06:07 +0000 (12:06 +1300)]
Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 23:02:05 +0000 (12:02 +1300)]
Merge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 22:46:00 +0000 (11:46 +1300)]
Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 22:34:21 +0000 (11:34 +1300)]
Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle

9 years agoMDL-32053 question: Question bank table displayed inconsistently
M Kassaei [Thu, 15 Mar 2012 09:33:51 +0000 (09:33 +0000)]
MDL-32053 question: Question bank table displayed inconsistently

9 years agoMDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE
M Kassaei [Wed, 14 Mar 2012 14:52:10 +0000 (14:52 +0000)]
MDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE

9 years agoMerge branch 'MDL-32064' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 19 Mar 2012 21:37:38 +0000 (10:37 +1300)]
Merge branch 'MDL-32064' of git://github.com/timhunt/moodle

9 years agoMDL-19125 upgrade: Fixed assignment typo
Sam Hemelryk [Mon, 19 Mar 2012 21:34:30 +0000 (10:34 +1300)]
MDL-19125 upgrade: Fixed assignment typo

9 years agoMerge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:38:28 +0000 (20:38 +1300)]
Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:33:48 +0000 (20:33 +1300)]
Merge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:29:39 +0000 (20:29 +1300)]
Merge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle

9 years agoMDL-27553 admin: Fixed override bug
Petr Skoda [Mon, 19 Mar 2012 07:21:33 +0000 (20:21 +1300)]
MDL-27553 admin: Fixed override bug

9 years agoMerge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:16:34 +0000 (20:16 +1300)]
Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle

9 years agoMDL-31640 course: removed extra error message, perpage is set properly, modulelink...
Rajesh Taneja [Tue, 13 Mar 2012 02:18:15 +0000 (10:18 +0800)]
MDL-31640 course: removed extra error message, perpage is set properly, modulelink hidden field, and new context call is used.

9 years agoMerge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:06:40 +0000 (20:06 +1300)]
Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-31528 navigation: Fixed up missing break and optimised category.php
Sam Hemelryk [Mon, 19 Mar 2012 06:32:15 +0000 (19:32 +1300)]
MDL-31528 navigation: Fixed up missing break and optimised category.php

9 years agoMDL-31984 Fixed whitespace during integration
Sam Hemelryk [Mon, 19 Mar 2012 06:12:02 +0000 (19:12 +1300)]
MDL-31984 Fixed whitespace during integration

9 years agoMDL-31984: add debugging message if theme renderer file is missnamed
Brian Jorgensen [Mon, 12 Mar 2012 18:38:53 +0000 (12:38 -0600)]
MDL-31984: add debugging message if theme renderer file is missnamed

9 years agoMDL-31640 course: Move to, edit and search functionality in search.php is fixed with...
Rajesh Taneja [Thu, 23 Feb 2012 04:09:02 +0000 (12:09 +0800)]
MDL-31640 course: Move to, edit and search functionality in search.php is fixed with proper permission check

9 years agoMDL-26674 wiki2.0: cleaned wiki event logging patch
Rajesh Taneja [Mon, 27 Feb 2012 02:28:01 +0000 (10:28 +0800)]
MDL-26674 wiki2.0: cleaned wiki event logging patch

9 years agoMerge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 19 Mar 2012 02:49:05 +0000 (15:49 +1300)]
Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle

9 years agoMDL-26674 wiki2.0: Fixed wiki activity log
Diane Villemure [Fri, 24 Feb 2012 08:37:19 +0000 (16:37 +0800)]
MDL-26674 wiki2.0: Fixed wiki activity log

9 years agoMerge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:37:49 +0000 (14:37 +1300)]
Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:28:06 +0000 (14:28 +1300)]
Merge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:14:28 +0000 (14:14 +1300)]
Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)]
Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle

9 years agoMDL-19125 upgrade: Fixed typo
Sam Hemelryk [Sun, 18 Mar 2012 22:01:50 +0000 (11:01 +1300)]
MDL-19125 upgrade: Fixed typo

9 years agoMerge branch 'MDL-30890' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 18 Mar 2012 21:28:14 +0000 (10:28 +1300)]
Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle

9 years agoMDL-19125 lib: Fixed up inline comments during integration
Sam Hemelryk [Sun, 18 Mar 2012 21:08:47 +0000 (10:08 +1300)]
MDL-19125 lib: Fixed up inline comments during integration

9 years agoMerge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Mar 2012 21:07:57 +0000 (10:07 +1300)]
Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle

9 years agoMDL-32094 some more E_STRICT fixes
Petr Skoda [Sun, 18 Mar 2012 18:22:17 +0000 (19:22 +0100)]
MDL-32094 some more E_STRICT fixes

9 years agoMDL-32094 do not show html markup in cron errors
Petr Skoda [Sun, 18 Mar 2012 17:43:47 +0000 (18:43 +0100)]
MDL-32094 do not show html markup in cron errors

9 years agoMDL-32094 some nasty quickforms hacks that should help with E_STRICT
Petr Skoda [Sun, 18 Mar 2012 17:39:37 +0000 (18:39 +0100)]
MDL-32094 some nasty quickforms hacks that should help with E_STRICT

Note: we have stopped tracking our QuickForms hacks long ago.

9 years agoMDL-32094 our ageing SimpleTest integration is not going to be compatible with E_STRICT
Petr Skoda [Sun, 18 Mar 2012 17:38:08 +0000 (18:38 +0100)]
MDL-32094 our ageing SimpleTest integration is not going to be compatible with E_STRICT

9 years agoMDL-32094 fix various E_STRICT compatibility problems
Petr Skoda [Sun, 18 Mar 2012 17:37:24 +0000 (18:37 +0100)]
MDL-32094 fix various E_STRICT compatibility problems

9 years agoMDL-32094 fix E_STRICT issues in lesson API
Petr Skoda [Sun, 18 Mar 2012 17:36:04 +0000 (18:36 +0100)]
MDL-32094 fix E_STRICT issues in lesson API

It is not possible to change method signatures in PHP...