10839 Commits

Author SHA1 Message Date
Sam Hemelryk
96e0194c05 Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes 2011-06-08 17:34:17 +08:00
Jerome Mouneyrac
c1b658832d MDL-27551 add enable mobile feature (enable web services + mobile service - add mobile builtin service - add unique shortname for service) 2011-06-08 15:10:26 +08:00
Sam Hemelryk
9186cb7e98 Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171 2011-06-08 11:07:22 +08:00
Sam Hemelryk
7bff5441c8 Merged changes for MDL-25394 2011-06-08 10:58:42 +08:00
Sam Hemelryk
0373264c20 Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565 2011-06-08 10:11:51 +08:00
Sam Hemelryk
78736e5d64 Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566 2011-06-08 10:02:59 +08:00
Jerome Mouneyrac
8d46dabb6e MDL-27565 implement moodle_notes_create_note 2011-06-07 17:28:51 +08:00
Jerome Mouneyrac
a623b6b892 MDL-27566-wip implement moodle_message_send_messages function (matching front end logic - TODO: 2 core functions to change to support bulk operations) 2011-06-07 16:40:55 +08:00
Tim Hunt
54771d89d1 Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php
2011-06-06 17:14:59 +01:00
Sam Hemelryk
e5824bb9c6 MDL-25394 Tidied up several things in order to get this integrated 2011-05-31 14:28:03 +08:00
Anthony Forth
37959dd471 MDL-25394 Improved support for mobile and device themes 2011-05-31 14:25:52 +08: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
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
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
Tim Hunt
c014b989ba MDL-27649 Convert the calculated question types to use the new variants mechanism. 2011-05-26 21:53:47 +01:00
Sam Hemelryk
2b04c41c58 MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
* Added the component and ratingarea fields and implemented it throughout
  the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
  API.
2011-05-23 12:35:39 +02:00
Tim Hunt
a2ac234956 MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade
Conflicts:
	lib/filestorage/file_storage.php
	mod/quiz/attemptlib.php
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	mod/quiz/report/responses/responses_table.php
	mod/quiz/report/statistics/db/install.xml
	mod/quiz/report/statistics/qstats.php
	mod/quiz/report/statistics/report.php
	mod/quiz/report/statistics/statistics_question_table.php
	mod/quiz/report/statistics/statistics_table.php
	mod/quiz/report/statistics/version.php
	mod/quiz/review.php
	mod/quiz/reviewquestion.php
	mod/quiz/startattempt.php
	mod/quiz/styles.css
	mod/quiz/view.php
	question/type/essay/questiontype.php
	question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php
	question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
	question/type/numerical/display.html
	question/type/numerical/questiontype.php
	question/type/questiontype.php
	question/type/random/questiontype.php
	question/type/shortanswer/questiontype.php
	theme/base/style/question.css
2011-05-11 20:29:49 +01:00
Sam Hemelryk
644b14c552 Merge branch 'MDL-27367-HEAD' of git://github.com/srynot4sale/moodle 2011-05-09 10:20:15 +08:00
Sam Hemelryk
d045b479f4 Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle 2011-05-05 10:41:53 +08:00
Sam Hemelryk
2c82d0eeb0 Merge branch 'MDL-26838_ratings_bad_data_master4' of git://github.com/andyjdavis/moodle 2011-05-05 10:18:39 +08:00
Dongsheng Cai
c1951ea953 MDL-26854 COMMENT
1. added pluginname_comment_validate callback to comments api
2. change permission callback defaults to false
3. Tidied up serveal areas of comments and implemented callback to
ignore system permissions for view (credits to Sam Hemelryk)

AMOS BEGIN
    MOV [modulerejectcomment,error],[callbackrejectcomment,error]
AMOS END
2011-05-04 17:23:46 +08:00
Sam Hemelryk
f4c7c735f5 Merge branch 's10_MDL-27330_dropbox_authorization_url_master' of github.com:dongsheng/moodle 2011-05-04 13:53:47 +08:00
Aaron Barnes
0e5e1daaee MDL-26190 completion blocks: Completion blocks shouldn't ever be blank 2011-05-04 12:55:26 +12:00
Dongsheng Cai
810aea11df MDL-27330 repository dropbox plugin
Dropbox changed authorization URL, and added a few error check code
2011-05-03 17:41:03 +08:00
Sam Hemelryk
c8ad2c12ba Merged MDL-26388 Fixed whitespace 2011-05-03 16:27:31 +08:00
Sam Hemelryk
5f1c825dfa Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings 2011-05-03 10:51:06 +08:00
Dongsheng Cai
f392caba15 MDL-26388, pop up a dialog when attaching a file already being used in draft area. 2011-05-02 10:11:19 +08:00
Andrew Davis (andyjdavis)
2c2ff8d5fc MDL-26838 rating: remove logged in users ability to sidestep rating validity checks 2011-05-01 18:50:13 +08:00
Aparup Banerjee
60b5a2fec7 MDL-27251 Files API - added timeout re-calculation as an optional argument. added setting for minimum Kbps for large files fetched from internet where the passed in timeout maybe too low.
allowed turning off the http HEAD request timeout calculation with zero (or negative) bitrate

	This was added in to allow servers that have a problem with
	HEAD requests to carry on with the given timeout without re-calculations.
	See PULL-651 for the discussion.

	the optional argument to force recalculation of timeout has been forced within scorm/locallib.php

	timeout re-calculation only increments timeout.
2011-04-27 10:49:40 +08:00
Eloy Lafuente (stronk7)
0540e39af9 Merge branch 'w17_MDL-27263_m21_loggedintypo' of git://github.com/skodak/moodle 2011-04-26 11:04:39 +02:00
Petr Skoda
3c2fffbaa7 MDL-27263 fix already logged in error message typo 2011-04-21 20:35:16 +02:00
Sam Hemelryk
75ee207b81 MDL-26770 enrol - Added support for bulk operations by enrol plugins 2011-04-21 10:13:13 +08:00
Sam Hemelryk
12a52d7c6e MDL-23532 enrol - removed general handling of user enrolment editing/unenrolment plugins are now responsible for this 2011-04-21 10:02:55 +08:00
Andrew Davis (andyjdavis)
3aafffc043 MDL-26835 gradebook: grader report now marks suspended students 2011-04-18 14:29:13 +08:00
David Mudrak
a95682b2b3 MDL-27053 Code maturity info added to admin notifications page
The patch introduces a new string to be displayed at admin notifications
page. The maturity level message for upgrade/install reworded as
requested in the tracker.

The patch also adds a new core call to purge all caches at the beginning
of the upgrade. This must be done before the upgrade starts so that the
strings are re-fetched from the updated source and not from the on-disk
cache.
2011-04-13 15:03:25 +02:00
Tim Hunt
6160bdb1f3 MDL-20636 Move question lang strings to the right place. 2011-04-12 15:20:29 +01:00
Petr Skoda
d2e360a95b Merge branch 'MDL-25718_recover_grades_master' of git://github.com/andyjdavis/moodle 2011-04-12 09:50:20 +02:00
Eloy Lafuente (stronk7)
af58cf7d40 Merge branch 'w15_MDL-26805_m21_userpol' of git://github.com/skodak/moodle 2011-04-11 15:15:40 +02:00
Petr Skoda
82053cb192 MDL-26805 cleanup default role selections
Frontpage role selection now allows only guest and frontpage roles. Default forntpage role is selected duuring install. Unused nodefaultuserrolelists option was removed completely. Coding style improvements.
2011-04-11 13:10:50 +02:00
Eloy Lafuente (stronk7)
920234498e Merge branch 's9_MDL-27098_filemanager_strings_master' of git://github.com/dongsheng/moodle 2011-04-11 11:18:23 +02:00
Dongsheng Cai
6d30723e41 MDL-27098
1. Fixed add file language string
2. Fixed hard-coded 'moving' string
3. Fixed hard-coded 'Files' string
2011-04-11 17:09:15 +08:00
Petr Skoda
b7e96b0ac0 MDL-27056 update location of GeoLite City file 2011-04-10 15:28:44 +02:00
Andrew Davis (andyjdavis)
13ba903634 enrol MDL-25718 added ability to recover user grades from grade history 2011-04-08 15:06:27 +08:00
Eloy Lafuente (stronk7)
b76070db70 Merge branch 'wip-MDL-26858' of git://github.com/samhemelryk/moodle 2011-04-04 21:53:17 +02:00
Eloy Lafuente (stronk7)
a7174151db Merge branch 'MDL-11288-course-module-cloning' of git://github.com/mudrd8mz/moodle 2011-04-04 12:35:04 +02:00
Petr Skoda
33620e1772 Merge branch 'MDL-26784-plugin-manager' of git://github.com/mudrd8mz/moodle 2011-04-04 11:55:39 +02:00
Sam Hemelryk
af8851282e enrolments MDL-26858 Added finish user enrolments button to JS dialogue 2011-04-04 14:37:35 +08:00
David Mudrak
91dedc324f MDL-26784 Strings for the new plugin manager
The new strings file core_plugin defines names of all plugin types
supported by Moodle. Some strings have already been defined elsewhere
and we use AMOS script here to copy their translation, if it is
available.

AMOS BEGIN
 CPY [settings,core],[settings,core_plugin]
 CPY [status,core],[status,core_plugin]
 CPY [missingfromdisk,core],[status_missing,core_plugin]
 CPY [nodatabase,core_admin],[status_nodb,core_plugin]
 CPY [authenticationplugins,core],[type_auth_plural,core_plugin]
 CPY [block,core],[type_block,core_plugin]
 CPY [blocks,core],[type_block_plural,core_plugin]
 CPY [coursereport,core],[type_coursereport,core_plugin]
 CPY [coursereports,core],[type_coursereport_plural,core_plugin]
 CPY [filter,core],[type_filter,core_plugin]
 CPY [courseformats,core],[type_format_plural,core_plugin]
 CPY [activitymodule,core],[type_mod,core_plugin]
 CPY [activitymodules,core],[type_mod_plural,core_plugin]
 CPY [plagiarism,core_plagiarism],[type_plagiarism,core_plugin]
 CPY [portfolio,core_portfolio],[type_portfolio,core_plugin]
 CPY [portfolios,core_portfolio],[type_portfolio_plural,core_plugin]
 CPY [questiontype,core_admin],[type_qtype,core_plugin]
 CPY [questiontypes,core_admin],[type_qtype_plural,core_plugin]
 CPY [repository,core_repository],[type_repository,core_plugin]
 CPY [theme,core],[type_theme,core_plugin]
 CPY [themes,core],[type_theme_plural,core_plugin]
 CPY [uninstallplugin,core_admin],[uninstall,core_plugin]
 CPY [version,core],[version,core_plugin]
 CPY [assignmenttype,mod_assignment],[subplugintype_assignment,mod_assignment]
 CPY [presets,mod_data],[subplugintype_datapreset_plural,mod_data]
 CPY [evaluationmethod,mod_workshop],[subplugintype_workshopeval,mod_workshop]
 CPY [strategy,mod_workshop],[subplugintype_workshopform,mod_workshop]
AMOS END
2011-03-31 13:59:05 +02:00