Aparup Banerjee [Tue, 3 Apr 2012 08:08:18 +0000 (16:08 +0800)]
Merge branch 'wip-MDL-32081-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 3 Apr 2012 07:55:12 +0000 (15:55 +0800)]
Merge branch 'MDL-31867-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 3 Apr 2012 07:06:09 +0000 (15:06 +0800)]
MDL-17327 database : fixed comparisions in sql to be cross db compatible in data_get_advanced_search_sql()
This was failing under the MSSQL database drivers.
Aparup Banerjee [Tue, 3 Apr 2012 06:58:27 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Tue, 3 Apr 2012 03:42:58 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 3 Apr 2012 03:39:14 +0000 (11:39 +0800)]
Merge branch 'wip-mdl-30904' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Apr 2012 03:09:31 +0000 (11:09 +0800)]
Merge branch 'MDL-32220' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 3 Apr 2012 02:18:19 +0000 (10:18 +0800)]
Merge branch 'wip-MDL-32269-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 2 Apr 2012 22:33:06 +0000 (10:33 +1200)]
Merge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 2 Apr 2012 08:59:10 +0000 (16:59 +0800)]
Merge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 2 Apr 2012 08:15:35 +0000 (16:15 +0800)]
Merge branch 'w14_MDL-32250_m23_simpletest110' of git://github.com/skodak/moodle
Petr Skoda [Mon, 2 Apr 2012 07:21:14 +0000 (09:21 +0200)]
MDL-32250 fixed case typo
Thanks Dan!
Dan Poltawski [Mon, 2 Apr 2012 03:49:20 +0000 (11:49 +0800)]
Merge branch 'MDL-32039' of git://github.com/timhunt/moodle
Andreas Grabs [Sat, 25 Feb 2012 11:29:57 +0000 (12:29 +0100)]
MDL-31768 - it is not possible to add a picture to the thanks page in feedback
M Kassaei [Tue, 27 Mar 2012 13:23:05 +0000 (14:23 +0100)]
MDL-32214 quiz regrading: with many attempts, PHP runs out of memory
Sam Hemelryk [Mon, 2 Apr 2012 02:31:30 +0000 (14:31 +1200)]
Merge branch 'MDL-32239' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Apr 2012 02:17:35 +0000 (10:17 +0800)]
Merge branch 'wip-MDL-32264-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 2 Apr 2012 02:03:10 +0000 (10:03 +0800)]
Merge branch 'MDL-32246' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 2 Apr 2012 01:40:09 +0000 (09:40 +0800)]
Merge branch 'MDL-32201' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Apr 2012 00:27:23 +0000 (12:27 +1200)]
MDL-30981 upgrade: Fixed a couple of phpdoc typos
Sam Hemelryk [Mon, 2 Apr 2012 00:26:41 +0000 (12:26 +1200)]
Merge branch 'MDL-30981' of git://github.com/stronk7/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
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
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
Eloy Lafuente (stronk7) [Sun, 1 Apr 2012 20:48:17 +0000 (22:48 +0200)]
MDL-30981 Upgrade API: Added related phpdocs
Sam Hemelryk [Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)]
Merge branch 'MDL-31711' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 1 Apr 2012 22:16:52 +0000 (10:16 +1200)]
Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle
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
Mary Evans [Sat, 31 Mar 2012 23:31:23 +0000 (00:31 +0100)]
MDL-32262 theme_afterburner: fixed missing comma in afterburner_styles.css
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
Rajesh Taneja [Thu, 22 Mar 2012 02:28:39 +0000 (10:28 +0800)]
MDL-32150 Libraries: checkbox controller will not check or uncheck freezed checkboxes
Rajesh Taneja [Thu, 22 Mar 2012 02:09:39 +0000 (10:09 +0800)]
MDL-32150 Libraries: checkall and uncheckall will not select disabled or readonly checkboxes
Rajesh Taneja [Fri, 23 Mar 2012 05:39:51 +0000 (13:39 +0800)]
MDL-30904 Calendar: Event links are descriptive with hidden event name, for screen readers
Sam Hemelryk [Tue, 27 Mar 2012 05:43:43 +0000 (13:43 +0800)]
MDL-31867 tags: Improve performance of course_get_tagged_courses()
Marina Glancy [Fri, 30 Mar 2012 01:11:20 +0000 (09:11 +0800)]
MDL-32269: undoing changes from MDL-32095 causing fatal error when using wikimedia
Marina Glancy [Fri, 23 Mar 2012 06:11:00 +0000 (14:11 +0800)]
MDL-32171: add 'Manage' link to Picasa repository
Sam Hemelryk [Mon, 26 Mar 2012 23:34:31 +0000 (12:34 +1300)]
MDL-32081 csslib: Improved handling of parentheses when processing styles
Sam Hemelryk [Mon, 26 Mar 2012 23:20:28 +0000 (12:20 +1300)]
MDL-32081 csslib: Added unit tests for complex background images
Sam Hemelryk [Thu, 29 Mar 2012 20:34:27 +0000 (09:34 +1300)]
MDL-32264 theme_standard: Fixed multi-day calendar event border issue
Tim Hunt [Thu, 29 Mar 2012 20:20:04 +0000 (21:20 +0100)]
MDL-32039 qeupgradehelper: fix typos in the lang strings
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
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
Tim Hunt [Wed, 28 Mar 2012 15:52:57 +0000 (16:52 +0100)]
MDL-32246 question export: should cope with unrecognised qtypes.
If a question is of an unrecognised type, then we just omit it from the export.
Tim Hunt [Wed, 28 Mar 2012 11:09:12 +0000 (12:09 +0100)]
MDL-32239 question bank: wrong cap checks editing/viewing quesitions
None of these problems affect the default roles. They only occur when
the permissions have been edited to allow restricted subsets of the
question capabilities.
In some cases, things that the restriced subset of capabilities should
have allowed were blocked by errors. In other cases, users were allowed
to do more than they should bave been due to failures to check the
right capabilities in the right places.
For full details, see the bug report.
Two of the bugs were previously reported separately as MDL-26395 and
MDL-27232.
Tim Hunt [Tue, 27 Mar 2012 16:41:14 +0000 (17:41 +0100)]
MDL-32220 question import: files sometimes stored in the wrong context.
Sadly, this involves a small API change, but I don't believe anyone was
using the argument I had to remove (because we were sometimes passing a
wrong value, and there is not way to compute the right value at that
point in the code.)
Also sadly, the code to compute the context we are importing into is now
rather spaghetti-like, but it works.
Tim Hunt [Mon, 26 Mar 2012 16:43:18 +0000 (17:43 +0100)]
MDL-32201 question export: use qformat_xml::write_answer in base class
Without this, images in answers were not being written to the export
file for questions using extra_answer_fields.
Petr Skoda [Thu, 29 Mar 2012 09:29:13 +0000 (11:29 +0200)]
MDL-32250 import latest SimpleTest 1.1.0
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:25:53 +0000 (13:25 +0200)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 29 Mar 2012 11:19:59 +0000 (13:19 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/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
AMOS bot [Thu, 29 Mar 2012 00:31:42 +0000 (00:31 +0000)]
Automatically generated installer lang files
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
Petr Skoda [Wed, 28 Mar 2012 20:48:18 +0000 (22:48 +0200)]
MDL-32095 last E_STRICT fix for now
Petr Skoda [Wed, 28 Mar 2012 20:47:57 +0000 (22:47 +0200)]
MDL-32095 fix outputlib test to setup debug level properly
Petr Skoda [Wed, 28 Mar 2012 14:39:42 +0000 (16:39 +0200)]
MDL-12730 new debug levels (support strict) + upgrade from old ones
Davo Smith [Tue, 27 Mar 2012 12:44:07 +0000 (13:44 +0100)]
MDL-32213 Question upgrade now correctly handles non-core manually-graded question types
Dan Poltawski [Tue, 27 Mar 2012 12:01:06 +0000 (20:01 +0800)]
MDL-31775 lesson: fix undefined variable warnings
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
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.
Dan Poltawski [Tue, 27 Mar 2012 06:46:52 +0000 (14:46 +0800)]
Merge branch 'MDL-32028' of git://github.com/nebgor/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
Dan Poltawski [Tue, 27 Mar 2012 04:37:08 +0000 (12:37 +0800)]
Merge branch 'MDL-30235' of git://github.com/lazydaisy/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
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
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
Sam Hemelryk [Mon, 26 Mar 2012 22:03:19 +0000 (11:03 +1300)]
Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/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
Sam Hemelryk [Mon, 26 Mar 2012 20:51:40 +0000 (09:51 +1300)]
Merge branch 'master_MDL-32147' of git://github.com/danmarsden/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
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
Eloy Lafuente (stronk7) [Mon, 26 Mar 2012 17:57:58 +0000 (19:57 +0200)]
MDL-32112 mysql: change rename sql generator to pass validation
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
Petr Skoda [Mon, 26 Mar 2012 14:04:47 +0000 (16:04 +0200)]
MDL-32095 fix event handler classes 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
Petr Skoda [Mon, 26 Mar 2012 13:30:04 +0000 (15:30 +0200)]
MDL-32095 fix backup API to be E_STRICT
Petr Skoda [Mon, 26 Mar 2012 09:47:15 +0000 (11:47 +0200)]
MDL-32095 some more E_STRICT fixes
Dan Poltawski [Mon, 26 Mar 2012 06:39:10 +0000 (14:39 +0800)]
Merge branch 'MDL-31775' 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
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
Dan Poltawski [Mon, 26 Mar 2012 03:28:21 +0000 (11:28 +0800)]
Merge branch 'MDL-27710' of git://github.com/rwijaya/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
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
Dan Poltawski [Mon, 26 Mar 2012 01:35:49 +0000 (09:35 +0800)]
Merge branch 'MDL-32176' 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
Iurii Kucherov [Thu, 22 Mar 2012 19:08:24 +0000 (21:08 +0200)]
MDL-31513 rename 'Edit service' to 'Save changes'
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
Sam Hemelryk [Sun, 25 Mar 2012 22:57:39 +0000 (11:57 +1300)]
Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle
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
Rajesh Taneja [Fri, 16 Mar 2012 06:54:21 +0000 (14:54 +0800)]
MDL-31903 course: Highlight icon will get iniatlised properly
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
Juho Viitasalo [Tue, 6 Mar 2012 07:42:12 +0000 (09:42 +0200)]
MDL-31903 course: Fixed course highlight icon and title toggle
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
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
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
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
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
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
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
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...
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.