Commit graph

11760 commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
a6b2f0faf2 Merge branch 'MDL-25191-master' of git://github.com/sammarshallou/moodle 2011-05-31 00:58:34 +02:00
Sam Hemelryk
52a3c2c703 Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle 2011-05-30 17:21:29 +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
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
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
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
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
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
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
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
Eloy Lafuente (stronk7)
5fba6731d3 MDL-27541 course reports - allow teachers to view individual reports 2011-05-26 01:29:41 +02: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
Aparup Banerjee
32561cafd4 MDL-27428 accessibility : made navigation and settings menu category span nodes navigable using tabs with tabindex=0 2011-05-23 11:12:53 +08:00
Tim Hunt
afe24f850b MDL-20636 Rename questiontype.php to questiontypebase.php. Also some conde-checker issues. 2011-05-17 16:46:57 +01:00
Tim Hunt
9c197f4445 MDL-20636 Fix some more codechecker issues. 2011-05-14 22:53:25 +01:00
Tim Hunt
aac80ff319 MDL-20636 fix most of the remaining codechecker issues in mod/quiz and lib/questionlib.php. 2011-05-13 00:33:44 +01:00
Tim Hunt
ab6cb45b7b MDL-27408 fix question engine upgrade issues on MySQL. 2011-05-12 23:17:58 +01:00
Tim Hunt
39759ac468 MDL-27408 fix a few minor bugs with the upgrade from 2.0.
More testing, and adaptive mode, still to come.
2011-05-12 21:03:24 +01:00
Tim Hunt
bb28e3bc5e MDL-27408 Moved the question engine install/upgrade code into the proper place.
I have tested upgrade from the previous development version, and a clean install. Upgrade from 2.0 still needs more work.
2011-05-12 18:58:50 +01:00
Eloy Lafuente (stronk7)
68fabb5c7e MDL-27481 profiling - prevent data to be sent to DB before it is available 2011-05-12 02:04:13 +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
Eloy Lafuente (stronk7)
36da956322 Merge branch 'MDL-27401-master' of git://github.com/sammarshallou/moodle 2011-05-09 17:46:22 +02:00
sam marshall
0367953eaf MDL-27401 Unit test errors in lib/simpletest/testpagelib_moodlepage.php 2011-05-09 11:15:55 +01:00
Sam Hemelryk
8f25ae26db Merge branch 'MDL-27325_master' of git://github.com/stronk7/moodle 2011-05-09 10:35:31 +08:00
Eloy Lafuente (stronk7)
91a7cd842d Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle 2011-05-09 02:04:34 +02:00
Eloy Lafuente (stronk7)
a8f60a4d58 Merge branch 'MDL-27317-variable-name-typos' of git://github.com/mudrd8mz/moodle 2011-05-09 01:58:38 +02:00
Eloy Lafuente (stronk7)
3c1ee10423 Merge branch 'MDL-27391-master' of git://github.com/sammarshallou/moodle 2011-05-09 00:58:55 +02:00
David Mudrak
52deafc143 MDL-27317 Fixed incorrect variable names in the language pack update
This was introduced by copying & pasting the code during 74a4c9.
2011-05-06 23:38:02 +02:00
Eloy Lafuente (stronk7)
86f456d8f0 MDL-27325 Adding some extreme, but 32bits safe, float tests 2011-05-06 16:07:17 +02:00
Eloy Lafuente (stronk7)
0c4c6d468a MDL-27325 Now also testing update_record and set_field 2011-05-06 16:07:17 +02:00
Eloy Lafuente (stronk7)
7aa9e45f56 MDL-27325 mysql: Avoid some implicit casting from float to varchar/text 2011-05-06 16:07:17 +02:00
Tim Hunt
6531aff715 MDL-27325 New DB unit tests to demonstrate the problem. 2011-05-06 16:07:17 +02:00
Sam Hemelryk
faca4f2f29 MDL-27400 Fixed up typo in blocklib.php 2011-05-06 16:27:15 +08:00
sam marshall
1cec45f1c0 MDL-26778 Completion unit tests broken by earlier change 2011-05-05 12:10:27 +01:00