Sam Hemelryk
c430467ca8
Merge branch 'MDL-28195' of git://github.com/timhunt/moodle
2011-07-11 15:02:03 +08:00
Sam Hemelryk
42afcc172a
Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle
2011-07-11 13:54:49 +08:00
Sam Hemelryk
08d29fb18d
Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
2011-07-11 11:25:21 +08:00
John Beedell
7cf83f47cc
MDL-27429 Adding tabindex and on keypress to the blocks show/hide icon.
2011-07-08 10:56:17 +01: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
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 87e0230d0a
2011-07-07 11:30:03 +02:00
Eloy Lafuente (stronk7)
26635fd7f9
Merge branch 'MDL-28169' of git://github.com/nebgor/moodle
2011-07-07 10:21:32 +02: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)
babbab1449
Merge branch 'MDL-27040' of git://github.com/timhunt/moodle
2011-07-06 19:25:47 +02:00
Tim Hunt
8f78cd5abc
MDL-28195 confirm_action should allow the button labels to be customised
2011-07-06 14:47:30 +01: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
5b966cbb3b
Merge branch 'MDL-28135' of git://github.com/nebgor/moodle
2011-07-06 10:53:48 +08: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)
ed436add99
Merge branch 'MDL-28179' of git://github.com/timhunt/moodle
2011-07-06 01:45:15 +02:00
Eloy Lafuente (stronk7)
60ee61147d
Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle
2011-07-06 01:29:27 +02:00
Eloy Lafuente (stronk7)
dd927fcefb
Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
2011-07-05 17:58:55 +02:00
Eloy Lafuente (stronk7)
555ac02985
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle
2011-07-05 17:46:46 +02:00
Eloy Lafuente (stronk7)
89526681cb
MDL-28185 upgrade - fix oracle problem upgrading blocks
2011-07-05 15:37:16 +02:00
Andrew Robert Nicols
b7eceef75f
MDL-28193 Add $external arg to get_driver_instance
...
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2011-07-05 12:22:41 +01:00
Aparup Banerjee
3b1b5018f7
MDL-28135 general Updated broken and typo docs links
2011-07-05 14:41:29 +08:00
Aparup Banerjee
728ebac7f2
MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/"
2011-07-05 14:27:31 +08:00
Tim Hunt
99fa9745c4
MDL-28179 make failed event hander error message much more useful.
2011-07-04 18:55:45 +01:00
Tim Hunt
abc2575493
MDL-27040 get_users_by_capability generates u.id IN () when no uesrs have accessallgroups
2011-07-04 18:50:21 +01:00
Petr Skoda
5607036a55
MDL-28167 fix missing new
...
And sloppy whitespace.
2011-07-04 16:42:55 +02:00
Tim Hunt
fd3932fe54
MDL-26618 Moving sticky blocks on other pages does not work in Oracle.
...
This was due to some missing $DB->sql_empty() in a query affecting the
block_positions table.
2011-07-04 15:36:16 +01:00
Tim Hunt
c141b05f7d
MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.
...
Also fix one bad <br/> in another lang string.
2011-07-04 15:35:03 +01:00
Petr Skoda
b216a820a1
MDL-28161 precreate htmlpurifier dir when resetting caches
...
Includes sloppy whitespace fix.
2011-07-04 09:48:03 +02:00
Dan Poltawski
8b0614d9ea
MDL-27855 navigation - only display participants link with permissions
2011-07-03 10:52:32 +01:00
Eloy Lafuente (stronk7)
ddaa914789
MDL-27829 block creation - ensure correct pagetypepattern in mod/ pages
2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
d72129829f
Merge branch 'MDL-28133' of git://github.com/timhunt/moodle
2011-07-01 01:10:06 +02:00
Eloy Lafuente (stronk7)
f9d2eb4f20
Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
2011-07-01 00:54:35 +02:00
Jamie Pratt
1e257a3a54
NOBUG if we are going to reuse the functions used within the evalmath code then
...
the calling api should not be weird with reversed parameters etc.
2011-06-30 17:50:05 +01:00
Jamie Pratt
9085134ed7
MDL-27659 "have evalmath accept numbers expressed with scientific
...
notation"
2011-06-30 17:49:49 +01:00
Jamie Pratt
4733133533
NOBUG fixed some coding style deviations in unit test code. Mostly
...
white space changes and added scope declarations to unit test
functions.
2011-06-30 17:49:31 +01:00
jamiepratt
e2beee5880
NOBUG move pattern for func and var names into a static var and make a function to test a string to see if it is a valid func or var name.
2011-06-30 17:49:01 +01:00
Eloy Lafuente (stronk7)
db0fe3b295
Merge branch 'MDL-28061' of git://github.com/rwijaya/moodle
2011-06-30 16:22:20 +02:00
Rossiani Wijaya
0c8d3939bc
MDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string mistype within the admin setting page (acc -> aac) and add mediaplugin_html5audio css class to align the player/link like the rest.
2011-06-30 19:29:07 +08:00
Jamie Pratt
5b5206e1cb
MDL-28099 Fixed regression as outlined in tracker.
2011-06-30 14:34:10 +07:00
Eloy Lafuente (stronk7)
4ea6ce7e39
Merge branch 'MDL-28044' of git://github.com/nebgor/moodle
2011-06-30 01:59:49 +02:00
Eloy Lafuente (stronk7)
0bde123fa8
Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle
2011-06-30 01:13:34 +02:00
Eloy Lafuente (stronk7)
a092e9bc42
Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle
2011-06-30 00:55:20 +02:00
Eloy Lafuente (stronk7)
586fecb80b
Merge branch 'MDL-27149' of git://github.com/timhunt/moodle
2011-06-30 00:20:43 +02:00
Eloy Lafuente (stronk7)
be13d37a02
Merge branch 'MDL-28074' of git://github.com/timhunt/moodle
2011-06-29 23:09:13 +02:00
Tim Hunt
56a4ae4673
MDL-28074 question preview should set context/course/cm properly.
...
1. We need this so that, for example, when previewing a question from
the quiz editing page, the preview uses the filter settings, theme and
language set for that quiz and course.
2011-06-29 21:25:56 +01:00
