Eloy Lafuente (stronk7) [Fri, 23 Dec 2011 00:10:03 +0000 (01:10 +0100)]
MDL-30760 question engine: reduce summary max size
MySQL only accepts 65536 (aprox) bytes in default TEXT
columns. So we define the max allowed as 32000 to allow
99.9% of utf-8 contents to fit. If some day MDL-19603 is
implemented and all current TEXTs are moved (MySQL) to
the BIG counterparts, this restriction can be out (MDL-19603).
Eloy Lafuente (stronk7) [Thu, 22 Dec 2011 08:48:23 +0000 (09:48 +0100)]
Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle
Gerard (Gerry) Caulfield [Thu, 22 Dec 2011 06:00:44 +0000 (14:00 +0800)]
MDL-29400 Fixing unset object bug encountered by Rajesh during testing
Sam Hemelryk [Wed, 21 Dec 2011 22:44:11 +0000 (11:44 +1300)]
Merge branch 'wip-MDL-18128-master-version3' of git://github.com/abgreeve/moodle
Sam Hemelryk [Wed, 21 Dec 2011 22:22:59 +0000 (11:22 +1300)]
MDL-30639 mod_lesson: Used a consistent format for users display of answer
Sam Hemelryk [Wed, 21 Dec 2011 22:21:22 +0000 (11:21 +1300)]
Merge branch 'MDL-30639' of git://github.com/rwijaya/moodle
Tim Hunt [Wed, 21 Dec 2011 12:39:55 +0000 (12:39 +0000)]
MDL-30704 quiz_overview: fixup, add missing rescaling.
Thanks Micheal de Raadt for catching this in testing.
Eloy Lafuente (stronk7) [Wed, 21 Dec 2011 15:28:22 +0000 (16:28 +0100)]
MDL-20245 grade: added tests for set_user_preference() and the 1333 limit
Added to tests to check that both the "limit" case of using 1333
chars is allowed and 1334 causes coding exception to happen
Eloy Lafuente (stronk7) [Wed, 21 Dec 2011 11:17:22 +0000 (12:17 +0100)]
MDL-20245 grade: fix version numbers
This commit puts the 22_STABLE and master main
versions back to "on-sync" mode (very first
weeks after major release).
Andrew Davis [Wed, 14 Dec 2011 06:57:46 +0000 (14:57 +0800)]
MDL-20245 grade: increased the length of the user_preferences::value column and added an exception to set_user_preference() is this new length is exceeded
Conflicts:
lib/db/upgrade.php
version.php
adrian@moodle.com [Mon, 12 Dec 2011 06:21:59 +0000 (14:21 +0800)]
MDL-18128 - forum - Addition of group editing for forums.
Aparup Banerjee [Wed, 21 Dec 2011 06:15:54 +0000 (14:15 +0800)]
Merge branch 'wip-MDL-30541-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Wed, 21 Dec 2011 04:03:25 +0000 (17:03 +1300)]
Merged MDL-28126 with cleanup
Aparup Banerjee [Wed, 21 Dec 2011 03:20:50 +0000 (11:20 +0800)]
MDL-28126 webservice : resolved integration conflicts
Sam Hemelryk [Wed, 21 Dec 2011 01:59:54 +0000 (14:59 +1300)]
Merge branch 'MDL-29239' of git://github.com/rwijaya/moodle
Jason Fowler [Fri, 9 Dec 2011 04:01:02 +0000 (12:01 +0800)]
MDL-30541 - Blog - Fixing the context for RSS Feed headers on the single blog entry pages
Sam Hemelryk [Wed, 21 Dec 2011 01:30:15 +0000 (14:30 +1300)]
Merge branch 'MDL-30704' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 23:40:25 +0000 (00:40 +0100)]
MDL-30777: whitespace fix
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 23:38:48 +0000 (00:38 +0100)]
Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 22:23:37 +0000 (23:23 +0100)]
Merge branch 'MDL-30170-mnet-undelete' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 21:53:12 +0000 (22:53 +0100)]
Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2011 21:36:31 +0000 (22:36 +0100)]
MDL-30761 make it work under Oracle. To revisit after MDL-29765 is done.
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
Darko Miletic [Tue, 20 Dec 2011 14:06:50 +0000 (11:06 -0300)]
MDL-30777: Properly implemented error message
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
Rossiani Wijaya [Tue, 20 Dec 2011 03:53:55 +0000 (11:53 +0800)]
MDL-30636 Lesson Module: fixed essay answer display format
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 [Tue, 13 Dec 2011 15:49:49 +0000 (15:49 +0000)]
MDL-30704 Quiz grades report shows inconsistent averages.
Previously, for the overall grade, we averaged the final marks for each
student; while for the individual question grades, we averaged all
grades.
The report now works consistently on the principle that the averages
should include exactly what is currenlty being shown in the report. This
is more logical, and so should be easier for users to understand.
If you want to see the averages that are currently shown (e.g. just the
average of each student's highers grade) then the report options let you
do that.
Tim Hunt [Thu, 15 Dec 2011 18:53:50 +0000 (18:53 +0000)]
MDL-29846 qbehaviours admin: correct $needed logic.
Also, fix a notice.
Rossiani Wijaya [Mon, 19 Dec 2011 07:08:15 +0000 (15:08 +0800)]
MDL-30636 Lesson Module: fixed essay answer display format
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
David Mudrak [Thu, 15 Dec 2011 20:26:45 +0000 (21:26 +0100)]
MDL-30170 MNet peers administration - various usability improvements
While fixing MDL-30170, the following tiny usability details were
improved along the way:
* the maximum length of the peer site title and the hostname is now
validated (this was actually a real bug as the default value is pre-loaded
from the peer) so the admin gets a nice validation error instead of
the database write exception when trying to register a host with a
longer site title.
* hard-coded English string 'All Hosts' is now localized
* the hostname link in the list of MNet peers leads to the peer itself
David Mudrak [Thu, 15 Dec 2011 20:15:56 +0000 (21:15 +0100)]
MDL-30170 MNet peers administration - highlight the undelete widget
The patch highlights the undelete radio selector at the host edit form.
It moves it to the end of the form (near the submit button) and displays
an explanation above the radio selector.
Also, the list of deleted hosts is now displayed below the table of
active peers at the Manage peers page.
The data returned by mnet_get_hosts() function now contain the deleted
status, too. It is possible to obtain deleted hosts from that function
now.
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.
Aparup Banerjee [Thu, 15 Dec 2011 10:04:42 +0000 (18:04 +0800)]
MDL-28126 webservice : string fixed.
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.