Commit graph

48110 commits

Author SHA1 Message Date
David Mudrák
071f617c52 Merge pull request #6 from rwijaya/MDL-27446b
MDL-27446 mod_lesson
2011-05-29 22:46:31 -07:00
Sam Hemelryk
8dc13ee7b0 Merge branch 'MDL-25512_master' of git://github.com/MaryE/moodle.git 2011-05-30 13:03:07 +08:00
Rossiani Wijaya
a6486a827f MDL-27441 mod_feedback: added conversion code to restore 1.9 backup to 2.1 site 2011-05-30 11:29:13 +08:00
Rossiani Wijaya
b44739c868 MDL-27446 mod_lesson: added conversion code to restore 1.9 backup to 2.1 site 2011-05-30 10:56:31 +08:00
Rajesh Taneja
6006774cf7 MDL-27603 enrol_user - changed modifier to modifierid which is used in database 2011-05-30 10:10:03 +08:00
Sam Hemelryk
5436561c7c Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle 2011-05-30 10:05:59 +08:00
Sam Hemelryk
59023e7799 Merge branch 'MDL-27636_master' of git://github.com/stronk7/moodle 2011-05-30 09:18:02 +08:00
Adam Olley
9b01f68597 MDL-27009: Fix role group by statement for statistics 2011-05-30 09:05:53 +08:00
Sam Hemelryk
9efd421e0e Merge branch 'navigationlib_userreports' of git://github.com/stronk7/moodle 2011-05-30 08:56:15 +08:00
Sam Hemelryk
91bad7adc1 Merge branch 'MDL-27627-master' of git://github.com/sammarshallou/moodle 2011-05-30 08:54:15 +08:00
Mary Evans
df7962f977 wip-MDL-25512 Correct CSS rules in Canvas theme to align with YUI3 CSS Fonts 2011-05-30 00:41:06 +01:00
David Mudrak
93264625f2 The source passed to the migrate_directory() may not exist
In case the source $rootpath passed to the migrate_directory() does not
exist, an empty array is returned by the method. Note that if the
directory exists and is empty, the directory itself is converter so
there would be a new record created. However, the restore process
ignores these records anyway, as the directory records are created
automatically by certain file api methods.
2011-05-29 00:38:23 +02:00
David Mudrak
214c492447 Converter file manager's methods take relative path within the backup instead of the absolute path 2011-05-29 00:18:19 +02:00
Tim Hunt
b360806d5c MDL-20636 update local/qeupgradehelper/README.txt. 2011-05-27 20:58:18 +01:00
Tim Hunt
85714b36c2 MDL-20636 implement the shell of the system for completing the upgrade using cron. 2011-05-27 20:46:37 +01:00
Tim Hunt
60006d2971 MDL-20636 remove bogus include that breaks cron. 2011-05-27 20:43:20 +01:00
Tim Hunt
1027301215 MDL-20636 Implement the ability to only upgrade some of the quiz attempts during the main upgrade. 2011-05-27 19:44:53 +01:00
Tim Hunt
61eca136c1 MDL-20636 remove the pretendupgrade script that does not work. 2011-05-27 18:10:15 +01:00
David Mudrák
64f7da2402 Merge pull request #2 from rwijaya/MDL-27450
MDL-27450 mod_survey: added conversion code to restore 1.9 backup to 2.1
2011-05-27 06:44:30 -07:00
Tim Hunt
a4c982917e MDL-20636 truefalse qtype clean up other unit tests to use the new way of making test tf questions. 2011-05-27 14:43:28 +01:00
Tim Hunt
188e174457 MDL-20636 truefalse qtype was showing the false feedback even when no response was given. #386 2011-05-27 14:41:48 +01:00
David Mudrák
455fc30367 Merge pull request #1 from nebgor/MDL-27440_chunkyfix
MDL-27440 Backup - added database module 1.9 backup converter
2011-05-27 06:34:38 -07:00
Ruslan Kabalin
65c941a698 MDL-27171 messages: use moodle_url in admin_page_ messaging classes
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 14:07:06 +01:00
Ruslan Kabalin
ebe0c008ca 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>
2011-05-27 14:07:06 +01:00
Ruslan Kabalin
b53b2b0ee9 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>
2011-05-27 14:07:06 +01:00
Ruslan Kabalin
ae2a213e1e 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>
2011-05-27 14:07:05 +01:00
Ruslan Kabalin
7a04c476a2 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>
2011-05-27 14:06:56 +01:00
Ruslan Kabalin
3bcbd80ebe MDL-27642 messages: ensure message processors are removed when plugin is being uninstalled
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
f15097b5a3 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>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
2e075f41b9 MDL-27171 messages: change send_message to accomodate changes in messaging
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
76a8aef9a1 MDL-27171 messages: allow using user IDs instead of objects in message_send function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
2af2210c4e MDL-27652 messages: fix varaibles names in message_send function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
f8351d0927 MDL-27171 messages: do not keep empty messging configuration strings in user preferences
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
814e373576 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>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
1d72e9d441 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>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
e710658d89 MDL-27171 forum: refactor forum settings
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
2f2137fca4 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>
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
75c34c23a4 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.
2011-05-27 13:49:28 +01:00
Ruslan Kabalin
21e6c82282 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>
2011-05-27 13:44:49 +01:00
Ruslan Kabalin
cd8f78c88f 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>
2011-05-27 13:44:49 +01:00
sam marshall
3fbe0e8a0f MDL-27627 Headers in moodleform_mod should have IDs 2011-05-27 13:40:02 +01:00
Adam Olley
0420f8dca0 MDL-25191: Properly destroy all elements of the modinfo cache 2011-05-27 13:28:55 +01:00
sam marshall
188a812794 MDL-27600 Navigation: Should be able to add nodes at other places than end of list 2011-05-27 13:18:03 +01:00
Tim Hunt
9199e7a569 MDL-20636 fix styling of essay questions. #371 2011-05-27 12:11:54 +01:00
Tim Hunt
612106b3a4 MDL-20636 fix URL handling for previews to always use Moodle URL.
Also, make the preview window big enough. #367
2011-05-27 11:49:23 +01:00
Wale Olujide
dc0373c852 MDL-20636 Make more space for the qusetion name in the question bank view #580. 2011-05-27 10:31:37 +01:00
David Mudrak
66f79e50a3 Files conversion support improved
The new file manager class is introduced. Once its public properties are
set, one can use it to migrate either a single file or a whole
directory. The course_files conversion reworked so that it uses the new
manager now. The files.xml written at the very end of the conversion,
giving all handlers a chance to migrate the files they need.
2011-05-27 04:13:34 +02:00
Tim Hunt
c014b989ba MDL-27649 Convert the calculated question types to use the new variants mechanism. 2011-05-26 21:53:47 +01:00
Tim Hunt
1da821bbde MDL-27649 support question variants as a first-class concept in the question engine. 2011-05-26 21:23:56 +01:00
David Mudrak
bef9ad9540 MDL-27647 Added the afterburner theme to the whitelist of standard plugins 2011-05-26 21:51:01 +02:00