Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 21:17:21 +0000 (22:17 +0100)]
Merge branch 'w51_MDL-30761_m23_slowmysql' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 21:02:11 +0000 (22:02 +0100)]
Merge branch 'MDL-30631' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 18:49:19 +0000 (19:49 +0100)]
Merge branch 'MDL-30603_m23' of https://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 17:55:31 +0000 (18:55 +0100)]
Merge branch 'MDL-29048-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 17:51:09 +0000 (18:51 +0100)]
Merge branch 'wip-MDL-30733-master' of github.com:marinaglancy/moodle
Aparup Banerjee [Tue, 20 Dec 2011 08:02:55 +0000 (16:02 +0800)]
MDL-25561 Gradebook : fixed whitespaces
Aparup Banerjee [Tue, 20 Dec 2011 07:52:38 +0000 (15:52 +0800)]
Merge branch 'MDL-25561_user_report_name_clickable' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 20 Dec 2011 05:38:21 +0000 (13:38 +0800)]
Merge branch 'MDL-30627-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Tue, 20 Dec 2011 03:54:23 +0000 (11:54 +0800)]
Merge branch 'MDL-30641-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Tue, 20 Dec 2011 03:08:42 +0000 (11:08 +0800)]
Merge branch 'MDL-30569-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 02:07:43 +0000 (03:07 +0100)]
Merge branch 'wip-mdl-29067' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 01:26:03 +0000 (02:26 +0100)]
Merge branch 'wip-MDL-30770-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 01:23:09 +0000 (02:23 +0100)]
Merge branch 'MDL-30739' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 01:21:00 +0000 (02:21 +0100)]
Merge branch 'MDL-30739' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 20 Dec 2011 01:15:47 +0000 (14:15 +1300)]
Merge branch 'MDL-30764-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 00:59:46 +0000 (01:59 +0100)]
Merge branch 'MDL-30738' of git://github.com/kiklop74/moodle
Sam Hemelryk [Tue, 20 Dec 2011 00:39:54 +0000 (13:39 +1300)]
Merge branch 'MDL-30760' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 20 Dec 2011 00:23:45 +0000 (13:23 +1300)]
Merge branch 'MDL-30646' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 20 Dec 2011 00:16:03 +0000 (13:16 +1300)]
Merge branch 'MDL-29846' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 19 Dec 2011 23:08:23 +0000 (12:08 +1300)]
Merge branch 'w51_MDL-30787_m23_coursemodedit' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 19 Dec 2011 22:59:33 +0000 (23:59 +0100)]
Merge branch 'MDL-30741_master' of git://github.com/jfilip/moodle
Sam Hemelryk [Mon, 19 Dec 2011 21:44:41 +0000 (10:44 +1300)]
Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 19 Dec 2011 21:24:16 +0000 (10:24 +1300)]
Merge branch 'w51_MDL-30779_m23_dbtransfer' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Dec 2011 21:21:35 +0000 (10:21 +1300)]
Merge branch 'w51_MDL-30765_m23_context' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Dec 2011 21:04:33 +0000 (10:04 +1300)]
Merge branch 'w51_MDL-30697_m23_roleslink' of git://github.com/skodak/moodle
Tim Hunt [Thu, 15 Dec 2011 18:53:50 +0000 (18:53 +0000)]
MDL-29846 qbehaviours admin: correct $needed logic.
Also, fix a notice.
Aparup Banerjee [Mon, 19 Dec 2011 03:52:33 +0000 (11:52 +0800)]
Merge branch 'w51_MDL-30735_m23_cron' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Dec 2011 03:22:42 +0000 (16:22 +1300)]
Merge branch 'w51_MDL-30789_m23_enrolupdatestatus' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Dec 2011 02:21:56 +0000 (15:21 +1300)]
Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 19 Dec 2011 02:06:01 +0000 (15:06 +1300)]
Merge branch 'MDL-37049' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Mon, 19 Dec 2011 01:17:20 +0000 (14:17 +1300)]
Merge branch 'MDL-30683' of git://github.com/timhunt/moodle
Mary Evans [Mon, 19 Dec 2011 00:06:10 +0000 (00:06 +0000)]
MDL-30500 Fix for Sky High report & print layout
Sam Hemelryk [Sun, 18 Dec 2011 23:28:52 +0000 (12:28 +1300)]
Merge branch 'MDL-29176' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Dec 2011 22:52:49 +0000 (11:52 +1300)]
Merge branch 'MDL-30734' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Dec 2011 22:37:10 +0000 (11:37 +1300)]
Merge branch 'MDL-30742' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Dec 2011 21:21:11 +0000 (10:21 +1300)]
Merge branch 'MDL-30744' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Dec 2011 20:27:48 +0000 (09:27 +1300)]
Merge branch 'MDL-30758' of git://github.com/timhunt/moodle
Petr Skoda [Sun, 18 Dec 2011 16:02:16 +0000 (17:02 +0100)]
MDL-30789 add new update_status() method to enrol plugins and improve enrol cache invalidation
Petr Skoda [Sun, 18 Dec 2011 10:54:02 +0000 (11:54 +0100)]
MDL-30787 fix use of module and section edit capabilities
Petr Skoda [Sat, 17 Dec 2011 13:46:47 +0000 (14:46 +0100)]
MDL-30697 fix incorrect capability for role assign button
Credit goes to Alexander Bias.
Petr Skoda [Sat, 17 Dec 2011 13:17:19 +0000 (14:17 +0100)]
MDL-30735 fix cron maintenancerun detection
Credit goes to Rodrigo Belluomini Cardilli.
Petr Skoda [Fri, 16 Dec 2011 22:02:50 +0000 (23:02 +0100)]
MDL-30765 fix invalid context variable
Tim Hunt [Fri, 16 Dec 2011 15:51:39 +0000 (15:51 +0000)]
MDL-30760 question engine: question summary can be longer than 64k!
1. So we will truncate the question summary to 65000 chars if necessary.
2. Also, fix one minor error in mutlianswer save_question_options.
question_bank::MAX_SUMMARY_LENGTH is not the most logical class to add
the constant to, but it needs to be accessible during upgrade, so I was
lazy and put it there.
Petr Skoda [Fri, 16 Dec 2011 13:22:25 +0000 (14:22 +0100)]
MDL-30761 improve get_user_access_sitewide() performance
Petr Skoda [Fri, 16 Dec 2011 13:22:20 +0000 (14:22 +0100)]
MDL-30761 fix simpletest regression caused by rubrics
Petr Skoda [Fri, 16 Dec 2011 13:18:51 +0000 (14:18 +0100)]
MDL-30779 add port and socket to dbtansfer tool
Sam Hemelryk [Fri, 16 Dec 2011 04:16:47 +0000 (17:16 +1300)]
MDL-30770 admin: Fixed notice about missing variable
Aparup Banerjee [Fri, 16 Dec 2011 03:36:47 +0000 (11:36 +0800)]
Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle
Rajesh Taneja [Wed, 14 Dec 2011 03:39:18 +0000 (11:39 +0800)]
MDL-29067 Admin: Added spam checking on comments, messages and forum posts
adrian@moodle.com [Fri, 2 Dec 2011 08:33:25 +0000 (16:33 +0800)]
MDL-28948 - lib - removed the hard coded key for the rc4encryt function.
Dan Marsden [Thu, 15 Dec 2011 22:22:39 +0000 (11:22 +1300)]
MDL-28728 SCORM Add missing string
Darko Miletic [Thu, 15 Dec 2011 20:14:10 +0000 (17:14 -0300)]
MDL-30631: Fixed the default grade import for the question for both CC
1.0 and 1.1
Tim Hunt [Thu, 15 Dec 2011 19:32:37 +0000 (19:32 +0000)]
MDL-29176 quiz editing: can't move questions onto a new page.
Tim Hunt [Thu, 15 Dec 2011 18:39:21 +0000 (18:39 +0000)]
MDL-30646 default qbank sort should only use visible columns.
sam marshall [Thu, 15 Dec 2011 16:43:12 +0000 (16:43 +0000)]
MDL-30764 Activity settings: do not disable grouping dropdown if it is already set
Justin Filip [Wed, 14 Dec 2011 16:37:45 +0000 (11:37 -0500)]
MDL-30741 Adding a new test to check for incorrect parsing of complicate HTML with a PRE tag.
Justin Filip [Wed, 14 Dec 2011 16:36:40 +0000 (11:36 -0500)]
MDL-30741 Fix the handling of PRE tags with the latest code from upstream: trac.roundcube.net/browser/trunk/roundcubemail/program/lib/html2text.php?rev=5497
Tim Hunt [Thu, 15 Dec 2011 12:50:49 +0000 (12:50 +0000)]
MDL-30758 quiz_statistics report fails if all 1st attempts require grading
Tim Hunt [Thu, 15 Dec 2011 12:22:00 +0000 (12:22 +0000)]
MDL-30739 qtype numerical: upgrade script uses SQL that is not cross-DB.
Eloy Lafuente (stronk7) [Thu, 15 Dec 2011 12:07:18 +0000 (13:07 +0100)]
MDL-30739 add one test to confirm the solution is cross-db
Tim Hunt [Thu, 15 Dec 2011 11:54:50 +0000 (11:54 +0000)]
MDL-30744 question editing permissions. Update to new accessslib.php code.
I don't believe this will actually fix the reported problem, which I
cannot reproduce, but it should give us much better error messages, at
which point we can fix it.
Tim Hunt [Thu, 15 Dec 2011 11:21:56 +0000 (11:21 +0000)]
MDL-30592 / MDL-27183 quiz statistics: fix merge problem.
These two fixes changes the same file in different ways, causing breakage.
Marina Glancy [Thu, 15 Dec 2011 08:44:14 +0000 (16:44 +0800)]
MDL-30733: synchronizing view_feedback with parent function to work with advanced grading
assignment_upload::view_feedback was overriden. It is altered the same way as parent function was to work with advanced grading and so it is displayed correctly in user complete report
Jamie Pratt [Thu, 15 Dec 2011 07:38:42 +0000 (14:38 +0700)]
MDL-30749 fixing typo referring to question instead of answer object
Aparup Banerjee [Thu, 15 Dec 2011 07:49:55 +0000 (15:49 +0800)]
Revert "MDL-30482 create new capability for viewing glossary entries"
This reverts commit
b92ac8c07989a7a7d8659169d465341e55a95d72.
Aparup Banerjee [Thu, 15 Dec 2011 07:47:46 +0000 (15:47 +0800)]
Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary" (test failed)
This reverts commit
aa423bd0e6a7b6c1f6cee4f95b46300e412551b4.
Ankit Kumar Agarwal [Thu, 15 Dec 2011 02:53:15 +0000 (08:23 +0530)]
MDL-30569 Administration Fixing the redirect after editting is toggeled on the front page
Eloy Lafuente (stronk7) [Wed, 14 Dec 2011 21:37:40 +0000 (22:37 +0100)]
MDL-30592 moodlelib: minor phpdocs/debug tweaks
Eloy Lafuente (stronk7) [Wed, 14 Dec 2011 21:03:26 +0000 (22:03 +0100)]
Merge branch 'MDL-30592' of git://github.com/timhunt/moodle
Tim Lock [Wed, 23 Nov 2011 02:20:55 +0000 (12:50 +1030)]
MDL-30419: IMS package content missing when using Blackboard packages
Darko Miletic [Wed, 14 Dec 2011 17:38:02 +0000 (14:38 -0300)]
MDL-30738: There was an incorrect parameter in $PAGE->set_url
after swithing courseid to id everything started working as it should.
Tim Hunt [Wed, 14 Dec 2011 17:17:07 +0000 (17:17 +0000)]
MDL-30742 restoring 1.9 backups with missing question data should be robust
Tim Hunt [Wed, 14 Dec 2011 14:29:00 +0000 (14:29 +0000)]
MDL-30734 question engine: sum_usage_marks_subquery edge-case.
When all qas in a useage are 'gaveup' state, it gives NULL, not 0.0, for the total.
Jason Fowler [Thu, 1 Dec 2011 05:47:59 +0000 (13:47 +0800)]
MDL-30482 - Glossary - Adding capability to other areas using glossary
Aparup Banerjee [Wed, 14 Dec 2011 06:59:16 +0000 (14:59 +0800)]
Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary"
This reverts commit
d79de196c9f0d19b54454e5109bb6b8ab34f07eb.
Aparup Banerjee [Wed, 14 Dec 2011 05:35:38 +0000 (13:35 +0800)]
Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle
Aparup Banerjee [Wed, 14 Dec 2011 05:12:57 +0000 (13:12 +0800)]
MDL-29325 fixed typo - camelcasing.
Sam Hemelryk [Wed, 14 Dec 2011 04:22:26 +0000 (17:22 +1300)]
Merge branch 'master_MDL-30576' of git://github.com/mayankgupta/moodle
Sam Hemelryk [Wed, 14 Dec 2011 04:17:10 +0000 (17:17 +1300)]
Merge branch 'MDL-27183' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 14 Dec 2011 02:16:20 +0000 (03:16 +0100)]
Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 14 Dec 2011 01:37:04 +0000 (02:37 +0100)]
Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle
Sam Hemelryk [Wed, 14 Dec 2011 01:26:42 +0000 (14:26 +1300)]
Merge branch 'MDL-30463' of git://github.com/rwijaya/moodle
Sam Hemelryk [Wed, 14 Dec 2011 01:08:37 +0000 (14:08 +1300)]
Merge branch 'MDL-30140' of git://github.com/mouneyrac/moodle
Tim Hunt [Tue, 13 Dec 2011 16:50:19 +0000 (16:50 +0000)]
MDL-30683 don't show overall feedback in the quiz grades report.
The grades are small, while the feedback can be big, which breaks the table layout.
Aparup Banerjee [Tue, 13 Dec 2011 08:51:23 +0000 (16:51 +0800)]
Merge branch 'MDL-29772' of git://github.com/bostelm/moodle
Aparup Banerjee [Tue, 13 Dec 2011 08:36:49 +0000 (16:36 +0800)]
MDL-29325 Enrol : reduced isset calls and improved readability
Aparup Banerjee [Tue, 13 Dec 2011 06:59:22 +0000 (14:59 +0800)]
Merge branch 'master_MDL-29325' of git://github.com/danmarsden/moodle
Aparup Banerjee [Tue, 13 Dec 2011 06:45:35 +0000 (14:45 +0800)]
Merge branch 'master_MDL-30577' of git://github.com/mayankgupta/moodle
Aparup Banerjee [Tue, 13 Dec 2011 06:34:42 +0000 (14:34 +0800)]
Merge branch 'MDL-30472-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 13 Dec 2011 06:29:25 +0000 (14:29 +0800)]
Merge branch 'MDL-30362-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Tue, 13 Dec 2011 05:48:43 +0000 (13:48 +0800)]
Merge branch 'MDL-30562' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 13 Dec 2011 05:20:21 +0000 (13:20 +0800)]
Merge branch 'MDL-30655-master' of git://github.com/sammarshallou/moodle
Alexnader Bias [Tue, 13 Dec 2011 05:17:43 +0000 (10:47 +0530)]
MDL-30472 Course Making user lists sortable when lastacess field is hidden
Aparup Banerjee [Tue, 13 Dec 2011 04:02:05 +0000 (12:02 +0800)]
Merge branch 'MDL-30559' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 13 Dec 2011 03:11:47 +0000 (11:11 +0800)]
Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle
Petr Skoda [Mon, 12 Dec 2011 13:28:19 +0000 (14:28 +0100)]
MDL-30575 more mail header cleanup
Mayank Gupa [Mon, 12 Dec 2011 10:15:40 +0000 (15:45 +0530)]
MDL-30645, Fixing evaluation of default value of CMI elements.
Sam Hemelryk [Mon, 12 Dec 2011 23:08:12 +0000 (12:08 +1300)]
Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 12 Dec 2011 22:20:22 +0000 (11:20 +1300)]
Merge branch 'MDL-30677' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 12 Dec 2011 22:15:27 +0000 (11:15 +1300)]
Merge branch 'MDL-30532' of git://github.com/timhunt/moodle
