Sam Hemelryk [Wed, 8 Jun 2011 05:03:11 +0000 (13:03 +0800)]
Merged branch 'MDL-27692_master' of git://github.com/MaryE/moodle.git
Sam Hemelryk [Wed, 8 Jun 2011 03:30:28 +0000 (11:30 +0800)]
Merge branch 'MDL-25477' of git://github.com/epsd/moodle
Sam Hemelryk [Wed, 8 Jun 2011 03:07:22 +0000 (11:07 +0800)]
Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171
Sam Hemelryk [Wed, 8 Jun 2011 02:58:42 +0000 (10:58 +0800)]
Merged changes for MDL-25394
Sam Hemelryk [Wed, 8 Jun 2011 02:38:29 +0000 (10:38 +0800)]
Merge branch 'MDL-27564-wip' of git://github.com/mouneyrac/moodle with changes for MDL-27564
Sam Hemelryk [Wed, 8 Jun 2011 02:11:51 +0000 (10:11 +0800)]
Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565
Sam Hemelryk [Wed, 8 Jun 2011 02:02:59 +0000 (10:02 +0800)]
Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566
Sam Hemelryk [Wed, 8 Jun 2011 01:49:43 +0000 (09:49 +0800)]
MDL-27721 Fixed up typo in upgrade comments
Eloy Lafuente (stronk7) [Tue, 7 Jun 2011 10:58:24 +0000 (12:58 +0200)]
MDL-27721 ratings - drop interim 'unknown' defaults
Jerome Mouneyrac [Tue, 7 Jun 2011 10:20:07 +0000 (18:20 +0800)]
MDL-27564 most parameter should have been optional - return more common information so no extra web service required - note that it could be good to return role and group for each user in each course (it would make sens and save some web service call)
Jerome Mouneyrac [Tue, 7 Jun 2011 09:28:51 +0000 (17:28 +0800)]
MDL-27565 implement moodle_notes_create_note
Jerome Mouneyrac [Tue, 7 Jun 2011 08:40:55 +0000 (16:40 +0800)]
MDL-27566-wip implement moodle_message_send_messages function (matching front end logic - TODO: 2 core functions to change to support bulk operations)
Sam Hemelryk [Tue, 7 Jun 2011 08:29:44 +0000 (16:29 +0800)]
Merged branch 's9_MDL-26392_wiki_files_master' from git://github.com/dongsheng/moodle.git with fixes
Sam Hemelryk [Tue, 7 Jun 2011 08:24:17 +0000 (16:24 +0800)]
Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Tue, 7 Jun 2011 08:23:34 +0000 (16:23 +0800)]
Merge branch 'MDL-27733-workshop-deadlines' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Tue, 7 Jun 2011 08:13:52 +0000 (16:13 +0800)]
Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Tue, 7 Jun 2011 08:09:55 +0000 (16:09 +0800)]
Merge branch 'admin_whitespace_cleanup_master' of git://github.com/stronk7/moodle
Sam Hemelryk [Tue, 7 Jun 2011 08:01:49 +0000 (16:01 +0800)]
Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2011 21:28:50 +0000 (23:28 +0200)]
MDL-20636 fix local/qeupgradehelper perms
Tim Hunt [Mon, 6 Jun 2011 17:26:32 +0000 (18:26 +0100)]
MDL-20636 fix notice on qtypes admin page. (Eloy review comment I2)
Tim Hunt [Mon, 6 Jun 2011 17:06:57 +0000 (18:06 +0100)]
MDL-27737 numerical qtype upgrade bug 2.0dev -> 2.0.
Tim Hunt [Mon, 6 Jun 2011 16:48:29 +0000 (17:48 +0100)]
MDL-20636 remove QTYPE from some comments.
Tim Hunt [Mon, 6 Jun 2011 16:26:33 +0000 (17:26 +0100)]
MDL-20636 qe restor make method protected (Eloy review comment B1).
Tim Hunt [Mon, 6 Jun 2011 16:22:49 +0000 (17:22 +0100)]
MDL-20636 Fix quiz_statistics upgrade (Eloy review comment A3).
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 16:24:59 +0000 (18:24 +0200)]
MDL-20636 changes to report statistics DB layer
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 16:09:19 +0000 (18:09 +0200)]
MDL-20636 changes to mod/quiz DB layer
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 12:37:46 +0000 (14:37 +0200)]
MDL-20636 changes to core & questions DB layer
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 11:28:52 +0000 (13:28 +0200)]
MDL-20636 changes to quiz and quiz reports upgrade code
Eloy Lafuente (stronk7) [Sat, 4 Jun 2011 01:24:09 +0000 (03:24 +0200)]
MDL-20636 changes to core & questions upgrade code
Changes include:
- fixing versions and requires to current weekly (
2011060313)
- fix essay wrong upgrade step. Review & test!
- fix numerical missing savepoint.
Tim Hunt [Mon, 6 Jun 2011 16:14:59 +0000 (17:14 +0100)]
Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
lib/db/upgrade.php
mod/quiz/lib.php
Tim Hunt [Mon, 6 Jun 2011 16:05:54 +0000 (17:05 +0100)]
MDL-20636 make qe upgrade tests independent of html2text details.
Based on Eloy's change, but refactored to be slightly nicer.
Tim Hunt [Mon, 6 Jun 2011 15:54:13 +0000 (16:54 +0100)]
MDL-27736 html2text add unit test for Eloy's new code.
Eloy Lafuente (stronk7) [Fri, 3 Jun 2011 16:34:32 +0000 (18:34 +0200)]
MDL-27736 improve a bit html2text to avoid some ugly & unnecessary trailing spaces
Eloy Lafuente (stronk7) [Fri, 3 Jun 2011 13:16:25 +0000 (15:16 +0200)]
MDL-20636 Whitespace fixes
Eloy Lafuente (stronk7) [Fri, 3 Jun 2011 10:14:39 +0000 (12:14 +0200)]
MDL-20636 Prepare stuff for cleaner merging
David Mudrak [Mon, 6 Jun 2011 13:57:02 +0000 (15:57 +0200)]
MDL-27734 Fixed weights of the example submission assessments
David Mudrak [Mon, 6 Jun 2011 13:40:56 +0000 (15:40 +0200)]
MDL-27733 workshop: keep the phase deadlines during the 1.9 => 2.0 upgrade
David Mudrak [Mon, 6 Jun 2011 13:16:46 +0000 (15:16 +0200)]
MDL-27732 Include the introformat field in the glossary module backups
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 17:46:46 +0000 (19:46 +0200)]
MDL-27724 wiki - update commented upgrade step to avoid future problems
Eloy Lafuente (stronk7) [Sun, 5 Jun 2011 17:34:12 +0000 (19:34 +0200)]
MDL-27723 whitespace cleanup of admin directory
Mary Evans [Fri, 3 Jun 2011 11:11:09 +0000 (12:11 +0100)]
MDL-27692_master Fixes issue - bullets not numbers in ordered list...
Dongsheng Cai [Fri, 3 Jun 2011 03:20:27 +0000 (11:20 +0800)]
MDL-26392 WIKI added file managment support to wiki editor
Eloy Lafuente (stronk7) [Thu, 2 Jun 2011 21:35:35 +0000 (23:35 +0200)]
weekly release 2.1dev
Ruslan Kabalin [Thu, 2 Jun 2011 08:27:05 +0000 (09:27 +0100)]
MDL-27171 messages: add processor uninstall function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Wed, 1 Jun 2011 11:30:28 +0000 (12:30 +0100)]
MDL-27171 messages: fix bug in upgrade_populate_default_messaging_prefs
isset check assumed that $defaultpreferences is the object
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Wed, 1 Jun 2011 10:44:36 +0000 (11:44 +0100)]
MDL-27652 messages: introduce message_update_processors
This function populates default message preferences for all existing providers
when the new message processor is added.
The change also includes update of message_set_default_message_preference to
make possible using it for particular message processor update.
install_populate_default_messaging_prefs() is no longer needed and depricted.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 15:00:32 +0000 (16:00 +0100)]
MDL-27171 messages: populate messaging defaults after the installation
This makes the order of plugins returned by get_plugin_types not important as
all messaging defaults population is done at the end.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 14:16:17 +0000 (15:16 +0100)]
MDL-27171 messages: meet require_once usage gudelines
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 13:02:37 +0000 (14:02 +0100)]
MDL-27171 messages: remove excessive include_once
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 11:30:03 +0000 (12:30 +0100)]
MDL-27171 messages: some minor fixes in translate_message_default_setting function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 11:26:15 +0000 (12:26 +0100)]
MDL-27171 messages: avoid using depricated notification method.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 10:18:11 +0000 (11:18 +0100)]
MDL-27171 messages: fix static variable filtering bug in get_message_processors
Static $processors should contain the full list of processors only, when
filtering is required, the $processors variable should not be updated.
Lambda function refactoring is made as well.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 09:55:30 +0000 (10:55 +0100)]
MDL-27171 messages: clean up pereferences on message provider removal
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 09:05:39 +0000 (10:05 +0100)]
MDL-27171 messages: recover message_update_providers backward compatibility
'return true' was removed by mistake
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 31 May 2011 08:46:22 +0000 (09:46 +0100)]
MDL-27171 messages: $defaultpreferences is an object, use isset instead.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Dan Poltawski [Tue, 31 May 2011 08:07:38 +0000 (09:07 +0100)]
messaging: MDL-27171 - change variable with underscores
Sam Hemelryk [Tue, 31 May 2011 06:28:03 +0000 (14:28 +0800)]
MDL-25394 Tidied up several things in order to get this integrated
Anthony Forth [Tue, 31 May 2011 06:25:52 +0000 (14:25 +0800)]
MDL-25394 Improved support for mobile and device themes
Eloy Lafuente (stronk7) [Mon, 30 May 2011 22:58:34 +0000 (00:58 +0200)]
Merge branch 'MDL-25191-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 30 May 2011 09:21:29 +0000 (17:21 +0800)]
Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 30 May 2011 05:03:07 +0000 (13:03 +0800)]
Merge branch 'MDL-25512_master' of git://github.com/MaryE/moodle.git
Rajesh Taneja [Mon, 30 May 2011 02:10:03 +0000 (10:10 +0800)]
MDL-27603 enrol_user - changed modifier to modifierid which is used in database
Sam Hemelryk [Mon, 30 May 2011 02:05:59 +0000 (10:05 +0800)]
Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 30 May 2011 01:18:02 +0000 (09:18 +0800)]
Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle
Adam Olley [Tue, 29 Mar 2011 01:16:17 +0000 (11:46 +1030)]
MDL-27009: Fix role group by statement for statistics
Sam Hemelryk [Mon, 30 May 2011 00:56:15 +0000 (08:56 +0800)]
Merge branch 'navigationlib_userreports' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 30 May 2011 00:54:15 +0000 (08:54 +0800)]
Merge branch 'MDL-27627-master' of git://github.com/sammarshallou/moodle
Mary Evans [Sun, 29 May 2011 23:12:27 +0000 (00:12 +0100)]
wip-MDL-25512 Correct CSS rules in Canvas theme to align with YUI3 CSS Fonts
Tim Hunt [Fri, 27 May 2011 19:58:18 +0000 (20:58 +0100)]
MDL-20636 update local/qeupgradehelper/README.txt.
Tim Hunt [Fri, 27 May 2011 19:46:37 +0000 (20:46 +0100)]
MDL-20636 implement the shell of the system for completing the upgrade using cron.
Tim Hunt [Fri, 27 May 2011 19:43:20 +0000 (20:43 +0100)]
MDL-20636 remove bogus include that breaks cron.
Tim Hunt [Fri, 27 May 2011 18:34:59 +0000 (19:34 +0100)]
MDL-20636 Implement the ability to only upgrade some of the quiz attempts during the main upgrade.
Tim Hunt [Fri, 27 May 2011 17:10:15 +0000 (18:10 +0100)]
MDL-20636 remove the pretendupgrade script that does not work.
Tim Hunt [Fri, 27 May 2011 13:43:28 +0000 (14:43 +0100)]
MDL-20636 truefalse qtype clean up other unit tests to use the new way of making test tf questions.
Tim Hunt [Fri, 27 May 2011 13:41:48 +0000 (14:41 +0100)]
MDL-20636 truefalse qtype was showing the false feedback even when no response was given. #386
Ruslan Kabalin [Fri, 27 May 2011 10:44:58 +0000 (11:44 +0100)]
MDL-27171 messages: use moodle_url in admin_page_ messaging classes
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 27 May 2011 08:28:09 +0000 (09:28 +0100)]
MDL-27171 messages: commenting style changes and extra comments
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
Ruslan Kabalin [Tue, 24 May 2011 09:08:14 +0000 (10:08 +0100)]
MDL-27171 messages: ensure message preferences for the core message providers are set
upgrade_core also attempts to populate the preferences, but since during the
first installation it is called before message outputs are set, we need to
force preferences setting at the end.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 24 May 2011 09:01:56 +0000 (10:01 +0100)]
MDL-27171 lib/moodlelib: change the order of plugins returned by get_plugin_types function
We need to ensure that message/output is installed first so that default
messaging settings are set correctly afterwards.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 20 May 2011 14:10:27 +0000 (15:10 +0100)]
MDL-27171 messages: implement new syntax in messages.php and update processing
The new messaging default settings can be set in messages.php and deployed
during installation. This also ensures the removing of settings on plugin
uninstallation and contains the update script to populate current default
settings on the existing system when the new feature is introduced.
For security reason we have to avoid using library functions in upgrade
function, so we set defaults the blind way. At this point we do not expect
plugins to have individual messaging defaults presets anyway. The site
defaults are the same as were set for each user using
message_set_default_message_preferences function.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 20 May 2011 13:01:28 +0000 (14:01 +0100)]
MDL-27642 messages: ensure message processors are removed when plugin is being uninstalled
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Thu, 26 May 2011 12:39:50 +0000 (13:39 +0100)]
MDL-27171 messages: remove excessive check from jabber send_message function
the parent send_message in messagelib.php does user/system configuration
checks before calling this method using the plugin instance.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Thu, 19 May 2011 16:25:39 +0000 (17:25 +0100)]
MDL-27171 messages: change send_message to accomodate changes in messaging
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 27 May 2011 09:07:26 +0000 (10:07 +0100)]
MDL-27171 messages: allow using user IDs instead of objects in message_send function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 27 May 2011 09:04:33 +0000 (10:04 +0100)]
MDL-27652 messages: fix varaibles names in message_send function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 27 May 2011 09:23:49 +0000 (10:23 +0100)]
MDL-27171 messages: do not keep empty messging configuration strings in user preferences
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 17 May 2011 09:47:21 +0000 (10:47 +0100)]
MDL-27171 messages: upgrade user profile messaging preferences interface
Existing user messaging preferences should accomodate default settings and
permissions. This also includes some changes to default outputs preferences.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Fri, 13 May 2011 10:13:13 +0000 (11:13 +0100)]
MDL-27171 messages: add default message outputs management interface
This introduces the new page where admin may change the permissions and
defaults for particular combination of message processors and providers.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Thu, 12 May 2011 14:24:56 +0000 (15:24 +0100)]
MDL-27171 forum: refactor forum settings
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Thu, 12 May 2011 11:11:47 +0000 (12:11 +0100)]
MDL-27171 messages: admin settings reordering
This includes:
* most email settings go from general admin setings to email plugin settings
* digestmailtime goes to mod/forum/settings.php
* supportname, supportemail and supportpage go to Support contact page
* all jabber settings go from general admin setings to jabber plugin settings
AMOS BEGIN
MOV [jabberhost,admin],[jabberhost,message_jabber]
MOV [configjabberhost,admin],[configjabberhost,message_jabber]
MOV [jabberserver,admin],[jabberserver,message_jabber]
MOV [configjabberserver,admin],[configjabberserver,message_jabber]
MOV [jabberusername,admin],[jabberusername,message_jabber]
MOV [configjabberusername,admin],[configjabberusername,message_jabber]
MOV [jabberpassword,admin],[jabberpassword,message_jabber]
MOV [configjabberpassword,admin],[configjabberpassword,message_jabber]
MOV [jabberport,admin],[jabberport,message_jabber]
MOV [configjabberport,admin],[configjabberport,message_jabber]
MOV [digestmailtime,admin],[digestmailtime,forum]
MOV [configdigestmailtime,admin],[configdigestmailtime,forum]
MOV [allowusermailcharset,admin],[allowusermailcharset,message_email]
MOV [configallowusermailcharset,admin],[configallowusermailcharset,message_email]
MOV [mailnewline,admin],[mailnewline,message_email]
MOV [configmailnewline,admin],[configmailnewline,message_email]
MOV [noreplyaddress,admin],[noreplyaddress,message_email]
MOV [confignoreplyaddress,admin],[confignoreplyaddress,message_email]
MOV [sitemailcharset,admin],[sitemailcharset,message_email]
MOV [configsitemailcharset,admin],[configsitemailcharset,message_email]
MOV [smtphosts,admin],[smtphosts,message_email]
MOV [configsmtphosts,admin],[configsmtphosts,message_email]
MOV [smtpmaxbulk,admin],[smtpmaxbulk,message_email]
MOV [configsmtpmaxbulk,admin],[configsmtpmaxbulk,message_email]
MOV [smtpuser,admin],[smtpuser,message_email]
MOV [configsmtpuser,admin],[configsmtpuser,message_email]
MOV [smtppass,admin],[smtppass,message_email]
AMOS END
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Wed, 11 May 2011 15:48:04 +0000 (16:48 +0100)]
MDL-27171 messages: add message outputs management interface page
This introduces the page for management message outputs (processors) where
admin may enable/disable them and jump to configuration pages.
Ruslan Kabalin [Wed, 11 May 2011 09:52:50 +0000 (10:52 +0100)]
MDL-27643 messages: message_output_jabber should not send messges to emails
Jabber message should only be send if destination user has Jabber ID specified
in the profile. It should not use email if jabber id is not provided as it is
a performance breach.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Ruslan Kabalin [Tue, 10 May 2011 16:51:56 +0000 (17:51 +0100)]
MDL-27171 messages: add new methods on the message_output class
This introduces the new methods to the abstract class: is_system_configured
and is_user_configured that are supposed to return boolean depending whether
required configuration has been made on both system or user level
respectively. These methods return true by default and and be overriden by
being declared in the plugin class itself
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
sam marshall [Fri, 27 May 2011 12:40:02 +0000 (13:40 +0100)]
MDL-27627 Headers in moodleform_mod should have IDs
Adam Olley [Tue, 5 Apr 2011 01:38:50 +0000 (11:08 +0930)]
MDL-25191: Properly destroy all elements of the modinfo cache
sam marshall [Mon, 23 May 2011 16:34:17 +0000 (17:34 +0100)]
MDL-27600 Navigation: Should be able to add nodes at other places than end of list
Tim Hunt [Fri, 27 May 2011 11:11:54 +0000 (12:11 +0100)]
MDL-20636 fix styling of essay questions. #371
Tim Hunt [Fri, 27 May 2011 10:49:23 +0000 (11:49 +0100)]
MDL-20636 fix URL handling for previews to always use Moodle URL.
Also, make the preview window big enough. #367
Wale Olujide [Fri, 27 May 2011 09:31:37 +0000 (10:31 +0100)]
MDL-20636 Make more space for the qusetion name in the question bank view #580.
Tim Hunt [Thu, 26 May 2011 20:53:47 +0000 (21:53 +0100)]
MDL-27649 Convert the calculated question types to use the new variants mechanism.