48680 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f6f6138379 weekly release 2.2dev 2011-07-08 11:15:49 +02:00
Eloy Lafuente (stronk7)
7e1fa4f019 fix permissions 2011-07-08 11:13:19 +02:00
Eloy Lafuente (stronk7)
1f767468ac Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle 2011-07-08 01:11:13 +02:00
Eloy Lafuente (stronk7)
4b02f9d2e9 Merge branch 'MDL-28168-custommenu' of git://github.com/mudrd8mz/moodle 2011-07-08 00:41:19 +02:00
Tim Hunt
0f83538e7e MDL-27890 tinymce - enable 30 as min height within moodle 2011-07-07 20:01:20 +02:00
Eloy Lafuente (stronk7)
d614e55c69 MDL-NOBUG tinymce - updated instructions to cover local modifications and other minor changes 2011-07-07 18:23:01 +02:00
Eloy Lafuente (stronk7)
1fa6eab70b MDL-27890 tinymce - allow it to be smaller 2011-07-07 17:38:44 +02:00
David Mudrak
20e7fd839a MDL-28015 workshop - fixed unique list of columns in ORDER BY clause
MSSQL requires that the columns in the ORDER BY clause list must be
unique. The patch populates the list of fields by combining an array of
explicit sort definition with an array of implicit (default) sort
definition.
2011-07-07 15:17:27 +02:00
Tim Hunt
7bf53cf233 MDL-27483 make quiz repagination more robust. 2011-07-07 12:38:06 +01:00
Tim Hunt
d0cfa81312 MDL-28192 local_qeupgradehelper fix typo. 2011-07-07 11:25:39 +01:00
David Mudrak
4564d58f9e MDL-28168 Multi-language support for custom_menu reimplemented
This is a reimplementation of the multi-language support for the
custom_menu class. The menu items now accept the forth optional
parameter with the explicit list of languages the item is valid for. If
no languages are listed, the item is valid for any language. The caller
of the custom_menu constructor must provide the user's current language
or null if the multi-language should not be supported (all items are
valid for any language then, regardless the definition).

See the attached unit tests for the examples of usage.
2011-07-07 11:30:04 +02:00
David Mudrak
155fffe6a4 MDL-28168 Improved custom_menu constructor
This improves custom_menu constructor by dropping support for useless
$text parameter and replacing it with the menu definition. This makes
custom_menu instance independent on the place where the menu is defined
($CFG->custommenuitems) and can be unit-tested. Also, multiple instances
of custom_menu can be instantiated now which can be interesting in the
future.
2011-07-07 11:30:03 +02:00
David Mudrak
153a13226e MDL-28168 Revert "MDL-27073 Support multi-language content in custom menu"
This reverts commit 87e0230d0a0f5993111e81e01a9f62713595136a.
2011-07-07 11:30:03 +02:00
Sun Zhigang
858d100fa3 MDL-27833 Backup - Fix can't search courses with non-latin characters during importing
PARAM_ALPHANUMEXT filter out all non-latin characters, including
Chinese, Japanese and etc. Use PARAM_NOTAGS instead.
2011-07-07 10:39:47 +02:00
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Eloy Lafuente (stronk7)
d9aa768139 Merge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle 2011-07-07 10:11:17 +02:00
Rossiani Wijaya
c65f0b6fb5 MDL-27755 course search: Add course id and shortname to search fields 2011-07-07 15:02:11 +08:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
907cc4ceb7 Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle 2011-07-07 03:00:42 +02:00
Eloy Lafuente (stronk7)
627e4bd4a7 Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle 2011-07-07 02:36:28 +02:00
Eloy Lafuente (stronk7)
6eb2cf62bd MDL-27989 whitespace fix 2011-07-07 02:21:44 +02:00
Eloy Lafuente (stronk7)
5b77684af7 Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle 2011-07-07 02:19:15 +02:00
Eloy Lafuente (stronk7)
dfef3028ae Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle 2011-07-07 02:10:13 +02:00
Eloy Lafuente (stronk7)
25e2bb1b83 Merge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle 2011-07-07 01:39:38 +02:00
Eloy Lafuente (stronk7)
535a635afc Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle 2011-07-07 01:32:30 +02:00
Eloy Lafuente (stronk7)
482b1ea121 Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle 2011-07-07 00:24:19 +02:00
Eloy Lafuente (stronk7)
4357214a49 Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle 2011-07-07 00:12:19 +02:00
Eloy Lafuente (stronk7)
b274bc55d0 Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle 2011-07-07 00:01:08 +02:00
Dan Poltawski
ac9695e5d8 MDL-26285 block_rss_client - do not disable with enablerssfeeds
This setting was used in 1.9 and below to control feed generation only, not
for RSS consumption.
2011-07-06 21:10:43 +01:00
Eloy Lafuente (stronk7)
83ca5bef34 Merge branch 'MDL-28222' of git://github.com/timhunt/moodle 2011-07-06 20:27:52 +02:00
Tim Hunt
82c07ea4f4 MDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade. 2011-07-06 19:08:52 +01:00
Eloy Lafuente (stronk7)
babbab1449 Merge branch 'MDL-27040' of git://github.com/timhunt/moodle 2011-07-06 19:25:47 +02:00
Eloy Lafuente (stronk7)
cb600c4606 Merge branch 'MDL-28166' of git://github.com/timhunt/moodle 2011-07-06 19:03:59 +02:00
Tim Hunt
6c7da46108 MDL-26165 quiz submit are-you-sure is potentially confusing. 2011-07-06 14:49:38 +01:00
Tim Hunt
8f78cd5abc MDL-28195 confirm_action should allow the button labels to be customised 2011-07-06 14:47:30 +01:00
Tim Hunt
81522abd63 MDL-28166 fix some more instances of my favourite becuase typo. 2011-07-06 14:19:25 +01:00
Tim Hunt
cbb8b55c33 MDL-28166 send quiz event notifications asynchronously.
This avoids the problem that you cannot send messages in transactions.

It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.
2011-07-06 14:16:30 +01:00
Rossiani Wijaya
fd9672ac65 MDL-27931 admin bulk user upload: convert city as required field. Credit goes to Charles Fulton for supplying the patch. 2011-07-06 15:13:16 +08:00
Sam Hemelryk
8f49f9ce8e Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle 2011-07-06 13:24:47 +08:00
Sam Hemelryk
50c1cb0394 Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle 2011-07-06 13:17:54 +08:00
Sam Hemelryk
024ad4bd82 Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle 2011-07-06 12:03:33 +08:00
Sam Hemelryk
1a3c5d2366 Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle 2011-07-06 11:19:27 +08:00
Sam Hemelryk
8323432992 Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle 2011-07-06 11:06:20 +08:00
Sam Hemelryk
5b966cbb3b Merge branch 'MDL-28135' of git://github.com/nebgor/moodle 2011-07-06 10:53:48 +08:00
Eloy Lafuente (stronk7)
ea9ad8f175 Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle 2011-07-06 03:13:11 +02:00
Eloy Lafuente (stronk7)
7edcd093b6 Merge branch 'MDL-28160' of git://github.com/timhunt/moodle 2011-07-06 03:06:34 +02:00
Eloy Lafuente (stronk7)
87cc19de07 Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle 2011-07-06 02:54:12 +02:00
Eloy Lafuente (stronk7)
b2dfa10d5a Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle 2011-07-06 02:05:20 +02:00
Eloy Lafuente (stronk7)
34d5507ab8 Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle 2011-07-06 01:52:32 +02:00
Eloy Lafuente (stronk7)
ed436add99 Merge branch 'MDL-28179' of git://github.com/timhunt/moodle 2011-07-06 01:45:15 +02:00