moodle.git
10 years agoMerge branch 'MDL-28100' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)]
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-27279' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 22:01:08 +0000 (00:01 +0200)]
Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-28222' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 18:27:52 +0000 (20:27 +0200)]
Merge branch 'MDL-28222' of git://github.com/timhunt/moodle

10 years agoMDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.
Tim Hunt [Wed, 6 Jul 2011 18:08:52 +0000 (19:08 +0100)]
MDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.

10 years agoMerge branch 'MDL-27040' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 17:25:47 +0000 (19:25 +0200)]
Merge branch 'MDL-27040' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28166' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 17:03:59 +0000 (19:03 +0200)]
Merge branch 'MDL-28166' of git://github.com/timhunt/moodle

10 years agoMDL-28166 fix some more instances of my favourite becuase typo.
Tim Hunt [Wed, 6 Jul 2011 13:19:25 +0000 (14:19 +0100)]
MDL-28166 fix some more instances of my favourite becuase typo.

10 years agoMDL-28166 send quiz event notifications asynchronously.
Tim Hunt [Mon, 4 Jul 2011 17:58:34 +0000 (18:58 +0100)]
MDL-28166 send quiz event notifications asynchronously.

This avoids the problem that you cannot send messages in transactions.

It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.

10 years agoMerge branch 'MDL-27934' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 05:24:47 +0000 (13:24 +0800)]
Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-27855' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 05:17:54 +0000 (13:17 +0800)]
Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-27168' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 04:03:33 +0000 (12:03 +0800)]
Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-26626' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 03:19:27 +0000 (11:19 +0800)]
Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 6 Jul 2011 03:06:20 +0000 (11:06 +0800)]
Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-28135' of git://github.com/nebgor/moodle
Sam Hemelryk [Wed, 6 Jul 2011 02:53:48 +0000 (10:53 +0800)]
Merge branch 'MDL-28135' of git://github.com/nebgor/moodle

10 years agoMerge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 01:13:11 +0000 (03:13 +0200)]
Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28160' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 01:06:34 +0000 (03:06 +0200)]
Merge branch 'MDL-28160' of git://github.com/timhunt/moodle

10 years agoMerge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 00:54:12 +0000 (02:54 +0200)]
Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle

10 years agoMerge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2011 00:05:20 +0000 (02:05 +0200)]
Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:52:32 +0000 (01:52 +0200)]
Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-28179' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:45:15 +0000 (01:45 +0200)]
Merge branch 'MDL-28179' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28193' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 23:29:27 +0000 (01:29 +0200)]
Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle

10 years agoMDL-28196 quiz calls get_in_or_equal (fixing missing $DB)
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 20:00:51 +0000 (22:00 +0200)]
MDL-28196 quiz calls get_in_or_equal (fixing missing $DB)

10 years agoMerge branch 'MDL-28196' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)]
Merge branch 'MDL-28196' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-27821' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 17:41:32 +0000 (19:41 +0200)]
Merge branch 'MDL-27821' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 15:58:55 +0000 (17:58 +0200)]
Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-26618' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 15:46:46 +0000 (17:46 +0200)]
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle

10 years agoMDL-28185 upgrade - fix oracle problem upgrading blocks
Eloy Lafuente (stronk7) [Tue, 5 Jul 2011 13:37:16 +0000 (15:37 +0200)]
MDL-28185 upgrade - fix oracle problem upgrading blocks

10 years agoMDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places
Tim Hunt [Tue, 5 Jul 2011 13:29:30 +0000 (14:29 +0100)]
MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places

Also, another minor error in one method call.

10 years agoMDL-28193 Add $external arg to get_driver_instance
Andrew Robert Nicols [Tue, 5 Jul 2011 10:58:14 +0000 (11:58 +0100)]
MDL-28193 Add $external arg to get_driver_instance

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
10 years agoMDL-26611 Roles Language - remove reference to 'legacy role type'
Dan Poltawski [Sun, 3 Jul 2011 20:04:04 +0000 (21:04 +0100)]
MDL-26611 Roles Language - remove reference to 'legacy role type'

10 years agoMerge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 5 Jul 2011 08:51:49 +0000 (16:51 +0800)]
Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle

10 years agoMDL-28135 general Updated broken and typo docs links
Aparup Banerjee [Tue, 5 Jul 2011 06:34:25 +0000 (14:34 +0800)]
MDL-28135 general Updated broken and typo docs links

10 years agoMDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releas...
Aparup Banerjee [Mon, 4 Jul 2011 08:07:54 +0000 (16:07 +0800)]
MDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releases instead of en/Release

10 years agoMDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev...
Aparup Banerjee [Mon, 4 Jul 2011 06:41:34 +0000 (14:41 +0800)]
MDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev/Releases now

10 years agoMDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc...
Aparup Banerjee [Mon, 4 Jul 2011 03:21:48 +0000 (11:21 +0800)]
MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/"

10 years agoMDL-24666 sync_users.php can throw db exception on sites upgraded from 1.x
Iñaki Arenaza [Mon, 4 Jul 2011 19:38:53 +0000 (21:38 +0200)]
MDL-24666 sync_users.php can throw db exception on sites upgraded from 1.x

From 2.0 on we lowercase all the settings related to LDAP attributes
to cope with differences in LDAP servers when returning attribute
names as array indices (some lowercase them, some leave them as
specified in the query, some normalize them, etc.).

But we only lowercase them when saving the settings page. So on sites
that have been migrated from 1.x, it may happen that we still have
mixed-case attribute names. And this is fatal for the user_attribute
setting, as we might not detect it in the returned array from LDAP and
it will be empty (and the db layer throws and exception).

So we just make sure the attribute name is lowercased (and trimmed,
in case it's got some white space around it).

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
10 years agoMDL-28179 make failed event hander error message much more useful.
Tim Hunt [Mon, 4 Jul 2011 17:55:45 +0000 (18:55 +0100)]
MDL-28179 make failed event hander error message much more useful.

10 years agoMDL-27040 get_users_by_capability generates u.id IN () when no uesrs have accessallgroups
Tim Hunt [Mon, 4 Jul 2011 17:50:21 +0000 (18:50 +0100)]
MDL-27040 get_users_by_capability generates u.id IN () when no uesrs have accessallgroups

10 years agoMDL-28167 fix missing new
Petr Skoda [Mon, 4 Jul 2011 14:42:55 +0000 (16:42 +0200)]
MDL-28167 fix missing new

And sloppy whitespace.

10 years agoMDL-26618 Moving sticky blocks on other pages does not work in Oracle.
Tim Hunt [Sat, 26 Feb 2011 11:26:13 +0000 (11:26 +0000)]
MDL-26618 Moving sticky blocks on other pages does not work in Oracle.

This was due to some missing $DB->sql_empty() in a query affecting the
block_positions table.

10 years agoMDL-27821 backup_exception should not throw away debug info.
Tim Hunt [Fri, 10 Jun 2011 14:44:20 +0000 (15:44 +0100)]
MDL-27821 backup_exception should not throw away debug info.

10 years agoMDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 secti...
Tim Hunt [Mon, 7 Mar 2011 18:08:04 +0000 (18:08 +0000)]
MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.

Also fix one bad <br/> in another lang string.

10 years agoMDL-28147 do not double cache theme css/js
Petr Skoda [Mon, 4 Jul 2011 09:29:23 +0000 (11:29 +0200)]
MDL-28147 do not double cache theme css/js

10 years agoMDL-28161 precreate htmlpurifier dir when resetting caches
Petr Skoda [Mon, 4 Jul 2011 07:48:03 +0000 (09:48 +0200)]
MDL-28161 precreate htmlpurifier dir when resetting caches

Includes sloppy whitespace fix.

10 years agoMDL-28172 forum: Fixed up overzealous check for portfolio enabled.
Sam Hemelryk [Mon, 4 Jul 2011 07:04:16 +0000 (15:04 +0800)]
MDL-28172 forum: Fixed up overzealous check for portfolio enabled.

10 years agoMDL-26626 course competion block - fix hardcoded string
Dan Poltawski [Sun, 3 Jul 2011 21:50:44 +0000 (22:50 +0100)]
MDL-26626 course competion block - fix hardcoded string

10 years agoMDL-27168 completionstatus block - Use localized strings
Dan Poltawski [Sun, 3 Jul 2011 19:49:59 +0000 (20:49 +0100)]
MDL-27168 completionstatus block - Use localized strings

10 years agoMDL-28160 question preview window uses wrong pagelayout in activity contexts
Tim Hunt [Sun, 3 Jul 2011 11:53:56 +0000 (12:53 +0100)]
MDL-28160 question preview window uses wrong pagelayout in activity contexts

10 years agoMDL-27855 navigation - only display participants link with permissions
Dan Poltawski [Sun, 3 Jul 2011 09:52:32 +0000 (10:52 +0100)]
MDL-27855 navigation - only display participants link with permissions

10 years agoMDL-28100 - page resource was not using context for text filtering
Dan Poltawski [Sat, 2 Jul 2011 12:30:58 +0000 (13:30 +0100)]
MDL-28100 - page resource was not using context for text filtering

10 years agoMDL-27279 lang/en/xmldb - Fix Typo in confirmcheckforeignkeys
Dan Poltawski [Sat, 2 Jul 2011 11:56:09 +0000 (12:56 +0100)]
MDL-27279 lang/en/xmldb - Fix Typo in confirmcheckforeignkeys

10 years agoMDL-27934 Upload Assignment - Remove useless code
Sun Zhigang [Mon, 20 Jun 2011 03:51:01 +0000 (11:51 +0800)]
MDL-27934 Upload Assignment - Remove useless code

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 21:58:02 +0000 (23:58 +0200)]
weekly release 2.2dev

10 years agorelease 2.1 v2.1.0
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 21:47:23 +0000 (23:47 +0200)]
release 2.1

10 years agofix permissions
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 21:39:00 +0000 (23:39 +0200)]
fix permissions

10 years agoMerge branch 'MDL-28152-course-grade-category' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 20:33:04 +0000 (22:33 +0200)]
Merge branch 'MDL-28152-course-grade-category' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-28103' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 20:17:16 +0000 (22:17 +0200)]
Merge branch 'MDL-28103' of git://github.com/timhunt/moodle

10 years agoMDL-28103 one more problem.
Tim Hunt [Fri, 1 Jul 2011 20:17:06 +0000 (21:17 +0100)]
MDL-28103 one more problem.

10 years agoMDL-28152 Improved detection of the course grade_category on course restore
David Mudrak [Fri, 1 Jul 2011 20:10:21 +0000 (22:10 +0200)]
MDL-28152 Improved detection of the course grade_category on course restore

10 years agoMDL-28103 code to deal with missing question_attempts was buggy.
Tim Hunt [Fri, 1 Jul 2011 19:58:39 +0000 (20:58 +0100)]
MDL-28103 code to deal with missing question_attempts was buggy.

10 years agoMDL-28103 make the upgrade more robust in the presence of old garbage data in the DB.
Tim Hunt [Fri, 1 Jul 2011 19:41:07 +0000 (20:41 +0100)]
MDL-28103 make the upgrade more robust in the presence of old garbage data in the DB.

10 years agoMDL-27829 blocks - lang string fixes. Credit goes to Helen!
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 18:29:07 +0000 (20:29 +0200)]
MDL-27829 blocks - lang string fixes. Credit goes to Helen!

10 years agoMDL-27829 blocks - clean dupe comments
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 17:41:28 +0000 (19:41 +0200)]
MDL-27829 blocks - clean dupe comments

10 years agoMDL-27829 block creation - ensure correct pagetypepattern in mod/ pages
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 16:29:39 +0000 (18:29 +0200)]
MDL-27829 block creation - ensure correct pagetypepattern in mod/ pages

10 years agoMDL-27829 course report - fix name of "Course completion report". Credit goes to...
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 14:23:28 +0000 (16:23 +0200)]
MDL-27829 course report - fix name of "Course completion report". Credit goes to Helen!

10 years agoMDL-28103 when handling questions that have been deleted from the question bank,...
Tim Hunt [Wed, 29 Jun 2011 23:36:45 +0000 (00:36 +0100)]
MDL-28103 when handling questions that have been deleted from the question bank, find the right updater class.

10 years agoMDL-28103 fix silly error in quiz_upgrade_very_old_question_sessions.
Tim Hunt [Wed, 29 Jun 2011 23:25:22 +0000 (00:25 +0100)]
MDL-28103 fix silly error in quiz_upgrade_very_old_question_sessions.

10 years agoMerge branch 'MDL-27960' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 14:13:51 +0000 (16:13 +0200)]
Merge branch 'MDL-27960' of git://github.com/nebgor/moodle

10 years agoMerge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 11:43:05 +0000 (13:43 +0200)]
Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle

10 years agoMDL-27960 assignment subplugin moodle1 conversion handling and handlers added
Aparup Banerjee [Wed, 22 Jun 2011 09:20:19 +0000 (17:20 +0800)]
MDL-27960 assignment subplugin moodle1 conversion handling and handlers added

10 years agoMerge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 09:51:26 +0000 (11:51 +0200)]
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

10 years agoMDL-27829 blocks: made the ability to add a block to all site administration pages...
Andrew Davis (andyjdavis) [Fri, 1 Jul 2011 09:02:44 +0000 (17:02 +0800)]
MDL-27829 blocks: made the ability to add a block to all site administration pages work

10 years agoMerge branch 'MDL-27418' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 09:05:17 +0000 (11:05 +0200)]
Merge branch 'MDL-27418' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28138' of git://github.com/timhunt/moodle
Sam Hemelryk [Fri, 1 Jul 2011 09:01:57 +0000 (17:01 +0800)]
Merge branch 'MDL-28138' of git://github.com/timhunt/moodle

10 years agoMDL-27418 fix minor regression found by Rajesh.
Tim Hunt [Fri, 1 Jul 2011 08:44:31 +0000 (09:44 +0100)]
MDL-27418 fix minor regression found by Rajesh.

10 years agoMerge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Fri, 1 Jul 2011 08:40:15 +0000 (10:40 +0200)]
Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle

10 years agoMDL-28138 fix calculated-specific format float function
Tim Hunt [Fri, 1 Jul 2011 08:14:56 +0000 (09:14 +0100)]
MDL-28138 fix calculated-specific format float function

Sadly this has to be done in question.php and in two places in the ugprade code :-(.

10 years agoMDL-27829 blocks: added some more page types to some _page_type_list() functions
Andrew Davis (andyjdavis) [Fri, 1 Jul 2011 07:43:26 +0000 (15:43 +0800)]
MDL-27829 blocks: added some more page types to some _page_type_list() functions

10 years agoMerge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle
Sam Hemelryk [Fri, 1 Jul 2011 07:07:21 +0000 (15:07 +0800)]
Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle

10 years agoMDL-27829 blocks: altered some strings so page type strings match the names of the...
Andrew Davis (andyjdavis) [Fri, 1 Jul 2011 02:01:38 +0000 (10:01 +0800)]
MDL-27829 blocks: altered some strings so page type strings match the names of the course reports in the UI

10 years agoMDL-28022 glossary entry without attachment can be exported to Mahara as Leap2A content
David Mudrak [Fri, 1 Jul 2011 00:34:00 +0000 (02:34 +0200)]
MDL-28022 glossary entry without attachment can be exported to Mahara as Leap2A content

The problem here was that the manifest file was written into the
'./files/leap2a.xml' instead of the './leap2a.xml' in the ZIP package.
I believe there was a bug in the write_new_file() using the 3rd parameter
incorrectly. A detailed review of all other modules using the same
method must happen soon.

10 years agoMerge branch 'MDL-28128' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 23:49:59 +0000 (01:49 +0200)]
Merge branch 'MDL-28128' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28129' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 23:41:38 +0000 (01:41 +0200)]
Merge branch 'MDL-28129' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28132' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 23:37:43 +0000 (01:37 +0200)]
Merge branch 'MDL-28132' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28133' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 23:10:06 +0000 (01:10 +0200)]
Merge branch 'MDL-28133' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)]
Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle

10 years agoMerge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 22:09:50 +0000 (00:09 +0200)]
Merge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-28116-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 21:56:53 +0000 (23:56 +0200)]
Merge branch 'MDL-28116-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-28006 restore - improved handling of gradebook 1.9 backups
David Mudrak [Thu, 30 Jun 2011 20:40:54 +0000 (22:40 +0200)]
MDL-28006 restore - improved handling of gradebook 1.9 backups

On contrary from a backup created in 2.0, the file gradebook.xml in the
converted MBZ can contain the course grade_item without the
corresponding grade_category record which is something restore_stepslib
did not expect. This patch fixes two places:

1) the gradebook restore does not use mapped itemid but calls
grade_category::fetch_course_category() to get the actual category to
link the course_item with

2) after_execute makes sure that the mapping actually exists before
trying to move the activities from the default root category

10 years agoMDL-28132 truncate very long category names before using them in random question...
Tim Hunt [Thu, 30 Jun 2011 18:34:44 +0000 (19:34 +0100)]
MDL-28132 truncate very long category names before using them in random question names.

10 years agoNOBUG if we are going to reuse the functions used within the evalmath code then
Jamie Pratt [Tue, 31 May 2011 09:20:13 +0000 (16:20 +0700)]
NOBUG if we are going to reuse the functions used within the evalmath code then
the calling api should not be weird with reversed parameters etc.

10 years agoMDL-27659 "have evalmath accept numbers expressed with scientific
Jamie Pratt [Sat, 28 May 2011 13:47:34 +0000 (20:47 +0700)]
MDL-27659 "have evalmath accept numbers expressed with scientific
notation"

10 years agoNOBUG fixed some coding style deviations in unit test code. Mostly
Jamie Pratt [Sat, 28 May 2011 13:31:46 +0000 (20:31 +0700)]
NOBUG fixed some coding style deviations in unit test code. Mostly
white space changes and added scope declarations to unit test
functions.

10 years agoNOBUG move pattern for func and var names into a static var and make a function to...
jamiepratt [Thu, 14 Apr 2011 05:48:47 +0000 (12:48 +0700)]
NOBUG move pattern for func and var names into a static var and make a function to test a string to see if it is a valid func or var name.

10 years agoMDL-28116 Fix issue restoring old backups with duplicate completion rows
sam marshall [Thu, 30 Jun 2011 16:27:18 +0000 (17:27 +0100)]
MDL-28116 Fix issue restoring old backups with duplicate completion rows

10 years agoMDL-28129 two issues with loading and saving questions
Jamie Pratt [Thu, 30 Jun 2011 16:21:37 +0000 (17:21 +0100)]
MDL-28129 two issues with loading and saving questions

1. Missing order by could randomise the order of the hints.

2. the extraanswerfields big had some SQL errros.

10 years agoMerge branch 'MDL-28115' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 15:09:42 +0000 (17:09 +0200)]
Merge branch 'MDL-28115' of git://github.com/rwijaya/moodle

10 years agoMDL-28128 finish the fix for MDL-28035.
Tim Hunt [Thu, 30 Jun 2011 15:00:15 +0000 (16:00 +0100)]
MDL-28128 finish the fix for MDL-28035.

There was one place where I had only fixed the backup code to work-around bad data from Moodle 2.0. I needed to make the equivalent change in the upgrade code.

The bad data is that the seq_number fields can be wrong (not unique). Se already have data ordered by (seq_number, id) and the array keys of the array we are building are not used for anything, so this fix deals with the problem.

10 years agoMerge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 14:39:45 +0000 (16:39 +0200)]
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-28061' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Thu, 30 Jun 2011 14:22:20 +0000 (16:22 +0200)]
Merge branch 'MDL-28061' of git://github.com/rwijaya/moodle